Skip to content

R
red-ci-cd
Commit 12fc8502 authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

Merge branch 'red-develop' into 'feature/RMS.v2.1-AMS' 

Red develop

See merge request rms/Backend/api-main-service!997
parents 951490ab 3ecabfd9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 419 deletions
app/entities/migrations/0007_auto_20200317_1005.py deleted 100644 → 0
View file @ 951490ab
# Generated by Django 2.2 on 2020-03-17 10:05
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('entities', '0006_auto_20200316_1813'),
]
operations = [
migrations.AlterField(
model_name='amsassetstock',
name='asset',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ams_asset_to_assetdetail', to='entities.AMSAsset', to_field='code'),
),
migrations.AlterField(
model_name='amsassetstock',
name='asset_group',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ams_asset_to_assetgroup', to='entities.AMSAssetGroup', to_field='code'),
),
]
app/entities/migrations/0008_delete_assetgroup.py deleted 100644 → 0
View file @ 951490ab
# Generated by Django 2.2 on 2020-03-17 10:12
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('entities', '0007_auto_20200317_1005'),
]
operations = [
migrations.DeleteModel(
name='AssetGroup',
),
]
app/entities/migrations/0009_auto_20200317_1203.py deleted 100644 → 0
View file @ 951490ab
# Generated by Django 2.2 on 2020-03-17 12:03
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('entities', '0008_delete_assetgroup'),
]
operations = [
migrations.AlterField(
model_name='amsasset',
name='asset_type',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ams_asset_type', to='entities.AMSAssetType', to_field='code'),
),
migrations.AlterField(
model_name='amsasset',
name='code',
field=models.CharField(default='', max_length=255, unique=True),
),
migrations.AlterField(
model_name='amsasset',
name='created_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ams_asset_created_by', to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='amsassetgroup',
name='created_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ams_asset_group_created_by', to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='amsassetstock',
name='asset',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ams_asset_to_assetdetail', to='entities.AMSAsset', to_field='code'),
),
migrations.AlterField(
model_name='amsassetstock',
name='asset_group',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ams_asset_to_assetgroup', to='entities.AMSAssetGroup', to_field='code'),
),
migrations.AlterField(
model_name='amsassetstock',
name='code',
field=models.CharField(default='', max_length=255, unique=True),
),
migrations.AlterField(
model_name='amsassetstock',
name='manager',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ams_asset_manager', to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='amsassetstock',
name='user_client',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ams_asset_user_client', to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='amsassettype',
name='created_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ams_asset_type_created_by', to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='amsprivilege',
name='department',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ams_privilege_departments', to='entities.Department', to_field='code'),
),
migrations.AlterField(
model_name='amsprivilege',
name='id_number',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ams_privilege_id_number', to=settings.AUTH_USER_MODEL, to_field='code'),
),
]
app/entities/migrations/0010_auto_20200318_1046.py deleted 100644 → 0
View file @ 951490ab
# Generated by Django 2.2 on 2020-03-18 10:46
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('entities', '0009_auto_20200317_1203'),
]
operations = [
migrations.RemoveField(
model_name='amsasset',
name='deleted_at',
),
migrations.RemoveField(
model_name='amsassetgroup',
name='deleted_at',
),
migrations.RemoveField(
model_name='amsassetstock',
name='deleted_at',
),
migrations.RemoveField(
model_name='amsassetstocksupport',
name='deleted_at',
),
migrations.RemoveField(
model_name='amsassettype',
name='deleted_at',
),
migrations.AddField(
model_name='amsasset',
name='is_active',
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name='amsassetgroup',
name='is_active',
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name='amsassetstock',
name='is_active',
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name='amsassetstocksupport',
name='is_active',
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name='amsassettype',
name='is_active',
field=models.BooleanField(default=True),
),
]
app/entities/migrations/0011_auto_20200318_1220.py deleted 100644 → 0
View file @ 951490ab
# Generated by Django 2.2 on 2020-03-18 12:20
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('entities', '0010_auto_20200318_1046'),
]
operations = [
migrations.RemoveField(
model_name='amsreport',
name='deleted_at',
),
migrations.RemoveField(
model_name='amsreporttype',
name='deleted_at',
),
migrations.AddField(
model_name='amsreport',
name='is_active',
field=models.BooleanField(default=True),
),
migrations.AddField(
model_name='amsreporttype',
name='is_active',
field=models.BooleanField(default=True),
),
migrations.AlterField(
model_name='amsreport',
name='asset_stock',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='report_to_asset_stock', to='entities.AMSAssetStock', to_field='code'),
),
migrations.AlterField(
model_name='amsreport',
name='code',
field=models.CharField(default='', max_length=255, unique=True),
),
migrations.AlterField(
model_name='amsreport',
name='report_type',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='report_to_report_type', to='entities.AMSReportType', to_field='code'),
),
migrations.AlterField(
model_name='amsreporttype',
name='code',
field=models.CharField(default='', max_length=255, unique=True),
),
migrations.AlterField(
model_name='entitylog',
name='entity',
field=models.CharField(choices=[('USER', 'USER'), ('APPLICATION', 'APPLICATION'), ('COMPANY', 'COMPANY'), ('DEPARTMENT', 'DEPARTMENT'), ('MODULE', 'MODULE'), ('DELEGATION', 'DELEGATION'), ('ChangeRequestTemplateHeader', 'ChangeRequestTemplateHeader'), ('ChangeRequestTemplateApprovers', 'ChangeRequestTemplateApprovers'), ('ChangeRequestTemplateStakeHolders', 'ChangeRequestTemplateStakeHolders'), ('ChangeRequestTemplateAttachments', 'ChangeRequestTemplateAttachments'), ('ChangeRequestTemplateDetails', 'ChangeRequestTemplateDetails'), ('ChangeRequestFormHeader', 'ChangeRequestFormHeader'), ('ChangeRequestFormApprovers', 'ChangeRequestFormApprovers'), ('ChangeRequestFormStakeHolders', 'ChangeRequestFormStakeHolders'), ('ChangeRequestFormAttachments', 'ChangeRequestFormAttachments'), ('ChangeRequestFormDetails', 'ChangeRequestFormDetails'), ('ChangeRequestSettings', 'ChangeRequestSettings'), ('AMSReportType', 'AMSReportType'), ('AMSReport', 'AMSReport')], default='Add', max_length=50),
),
]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment