mirror of
https://github.com/ae-utbm/sith.git
synced 2025-07-10 03:49:24 +00:00
Reset all migrations and migrate companies
This commit is contained in:
Skia
@ -2,53 +2,58 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.core.validators
|
||||
import accounting.models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('core', '0001_initial'),
|
||||
('club', '0001_initial'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='AccountingType',
|
||||
fields=[
|
||||
('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)),
|
||||
('code', models.CharField(verbose_name='code', max_length=16)),
|
||||
('label', models.CharField(verbose_name='label', max_length=60)),
|
||||
('movement_type', models.CharField(verbose_name='movement type', choices=[('credit', 'Credit'), ('debit', 'Debit'), ('neutral', 'Neutral')], max_length=12)),
|
||||
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)),
|
||||
('code', models.CharField(max_length=16, verbose_name='code', validators=[django.core.validators.RegexValidator('^[0-9]*$', 'An accounting type code contains only numbers')])),
|
||||
('label', models.CharField(max_length=128, verbose_name='label')),
|
||||
('movement_type', models.CharField(choices=[('CREDIT', 'Credit'), ('DEBIT', 'Debit'), ('NEUTRAL', 'Neutral')], max_length=12, verbose_name='movement type')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'accounting type',
|
||||
'ordering': ['movement_type', 'code'],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='BankAccount',
|
||||
fields=[
|
||||
('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)),
|
||||
('name', models.CharField(verbose_name='name', max_length=30)),
|
||||
('iban', models.CharField(blank=True, verbose_name='iban', max_length=255)),
|
||||
('number', models.CharField(blank=True, verbose_name='account number', max_length=255)),
|
||||
('club', models.ForeignKey(related_name='bank_accounts', to='club.Club')),
|
||||
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)),
|
||||
('name', models.CharField(max_length=30, verbose_name='name')),
|
||||
('iban', models.CharField(max_length=255, blank=True, verbose_name='iban')),
|
||||
('number', models.CharField(max_length=255, blank=True, verbose_name='account number')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Bank account',
|
||||
'ordering': ['club', 'name'],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='ClubAccount',
|
||||
fields=[
|
||||
('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)),
|
||||
('name', models.CharField(verbose_name='name', max_length=30)),
|
||||
('bank_account', models.ForeignKey(related_name='club_accounts', to='accounting.BankAccount')),
|
||||
('club', models.OneToOneField(related_name='club_account', to='club.Club')),
|
||||
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)),
|
||||
('name', models.CharField(max_length=30, verbose_name='name')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'Club account',
|
||||
'ordering': ['bank_account', 'name'],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Company',
|
||||
fields=[
|
||||
('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)),
|
||||
('name', models.CharField(verbose_name='name', max_length=60)),
|
||||
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)),
|
||||
('name', models.CharField(max_length=60, verbose_name='name')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'company',
|
||||
@ -57,41 +62,49 @@ class Migration(migrations.Migration):
|
||||
migrations.CreateModel(
|
||||
name='GeneralJournal',
|
||||
fields=[
|
||||
('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)),
|
||||
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)),
|
||||
('start_date', models.DateField(verbose_name='start date')),
|
||||
('end_date', models.DateField(default=None, null=True, verbose_name='end date', blank=True)),
|
||||
('name', models.CharField(verbose_name='name', max_length=30)),
|
||||
('closed', models.BooleanField(default=False, verbose_name='is closed')),
|
||||
('amount', accounting.models.CurrencyField(default=0, decimal_places=2, max_digits=12, verbose_name='amount')),
|
||||
('effective_amount', accounting.models.CurrencyField(default=0, decimal_places=2, max_digits=12, verbose_name='effective_amount')),
|
||||
('club_account', models.ForeignKey(related_name='journals', to='accounting.ClubAccount')),
|
||||
('end_date', models.DateField(null=True, verbose_name='end date', default=None, blank=True)),
|
||||
('name', models.CharField(max_length=40, verbose_name='name')),
|
||||
('closed', models.BooleanField(verbose_name='is closed', default=False)),
|
||||
('amount', accounting.models.CurrencyField(decimal_places=2, default=0, verbose_name='amount', max_digits=12)),
|
||||
('effective_amount', accounting.models.CurrencyField(decimal_places=2, default=0, verbose_name='effective_amount', max_digits=12)),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'General journal',
|
||||
'ordering': ['-start_date'],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Operation',
|
||||
fields=[
|
||||
('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)),
|
||||
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)),
|
||||
('number', models.IntegerField(verbose_name='number')),
|
||||
('amount', accounting.models.CurrencyField(decimal_places=2, max_digits=12, verbose_name='amount')),
|
||||
('date', models.DateField(verbose_name='date')),
|
||||
('label', models.CharField(verbose_name='label', max_length=50)),
|
||||
('remark', models.TextField(verbose_name='remark', max_length=255)),
|
||||
('mode', models.CharField(verbose_name='payment method', choices=[('CHEQUE', 'Check'), ('CASH', 'Cash'), ('TRANSFert', 'Transfert'), ('CARD', 'Credit card')], max_length=255)),
|
||||
('cheque_number', models.IntegerField(default=-1, verbose_name='cheque number')),
|
||||
('done', models.BooleanField(default=False, verbose_name='is done')),
|
||||
('target_type', models.CharField(verbose_name='target type', choices=[('USER', 'User'), ('CLUB', 'Club'), ('ACCOUNT', 'Account'), ('COMPANY', 'Company'), ('OTHER', 'Other')], max_length=10)),
|
||||
('remark', models.CharField(max_length=128, verbose_name='comment')),
|
||||
('mode', models.CharField(choices=[('CHECK', 'Check'), ('CASH', 'Cash'), ('TRANSFERT', 'Transfert'), ('CARD', 'Credit card')], max_length=255, verbose_name='payment method')),
|
||||
('cheque_number', models.CharField(max_length=32, null=True, verbose_name='cheque number', default='', blank=True)),
|
||||
('done', models.BooleanField(verbose_name='is done', default=False)),
|
||||
('target_type', models.CharField(choices=[('USER', 'User'), ('CLUB', 'Club'), ('ACCOUNT', 'Account'), ('COMPANY', 'Company'), ('OTHER', 'Other')], max_length=10, verbose_name='target type')),
|
||||
('target_id', models.IntegerField(null=True, verbose_name='target id', blank=True)),
|
||||
('target_label', models.CharField(default='', blank=True, verbose_name='target label', max_length=32)),
|
||||
('accounting_type', models.ForeignKey(verbose_name='accounting type', related_name='operations', to='accounting.AccountingType')),
|
||||
('invoice', models.ForeignKey(verbose_name='invoice', related_name='operations', blank=True, null=True, to='core.SithFile')),
|
||||
('journal', models.ForeignKey(related_name='operations', to='accounting.GeneralJournal')),
|
||||
('target_label', models.CharField(max_length=32, blank=True, verbose_name='target label', default='')),
|
||||
('accounting_type', models.ForeignKey(null=True, related_name='operations', verbose_name='accounting type', to='accounting.AccountingType', blank=True)),
|
||||
],
|
||||
options={
|
||||
'ordering': ['-number'],
|
||||
},
|
||||
),
|
||||
migrations.AlterUniqueTogether(
|
||||
name='operation',
|
||||
unique_together=set([('number', 'journal')]),
|
||||
migrations.CreateModel(
|
||||
name='SimplifiedAccountingType',
|
||||
fields=[
|
||||
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)),
|
||||
('label', models.CharField(max_length=128, verbose_name='label')),
|
||||
('accounting_type', models.ForeignKey(verbose_name='simplified accounting types', to='accounting.AccountingType', related_name='simplified_types')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'simplified type',
|
||||
'ordering': ['accounting_type__movement_type', 'accounting_type__code'],
|
||||
},
|
||||
),
|
||||
]
|
||||
|
||||
60
accounting/migrations/0002_auto_20160824_2152.py
Normal file
60
accounting/migrations/0002_auto_20160824_2152.py
Normal file
@ -0,0 +1,60 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('club', '0001_initial'),
|
||||
('accounting', '0001_initial'),
|
||||
('core', '0001_initial'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='operation',
|
||||
name='invoice',
|
||||
field=models.ForeignKey(null=True, related_name='operations', verbose_name='invoice', to='core.SithFile', blank=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='operation',
|
||||
name='journal',
|
||||
field=models.ForeignKey(verbose_name='journal', to='accounting.GeneralJournal', related_name='operations'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='operation',
|
||||
name='linked_operation',
|
||||
field=models.OneToOneField(blank=True, to='accounting.Operation', null=True, related_name='operation_linked_to', verbose_name='linked operation', default=None),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='operation',
|
||||
name='simpleaccounting_type',
|
||||
field=models.ForeignKey(null=True, related_name='operations', verbose_name='simple type', to='accounting.SimplifiedAccountingType', blank=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='generaljournal',
|
||||
name='club_account',
|
||||
field=models.ForeignKey(verbose_name='club account', to='accounting.ClubAccount', related_name='journals'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='clubaccount',
|
||||
name='bank_account',
|
||||
field=models.ForeignKey(verbose_name='bank account', to='accounting.BankAccount', related_name='club_accounts'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='clubaccount',
|
||||
name='club',
|
||||
field=models.ForeignKey(verbose_name='club', to='club.Club', related_name='club_account'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='bankaccount',
|
||||
name='club',
|
||||
field=models.ForeignKey(verbose_name='club', to='club.Club', related_name='bank_accounts'),
|
||||
),
|
||||
migrations.AlterUniqueTogether(
|
||||
name='operation',
|
||||
unique_together=set([('number', 'journal')]),
|
||||
),
|
||||
]
|
||||
50
accounting/migrations/0003_auto_20160824_2203.py
Normal file
50
accounting/migrations/0003_auto_20160824_2203.py
Normal file
@ -0,0 +1,50 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import phonenumber_field.modelfields
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('accounting', '0002_auto_20160824_2152'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='company',
|
||||
name='city',
|
||||
field=models.CharField(blank=True, verbose_name='city', max_length=60),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='company',
|
||||
name='country',
|
||||
field=models.CharField(blank=True, verbose_name='country', max_length=32),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='company',
|
||||
name='email',
|
||||
field=models.EmailField(blank=True, verbose_name='email', max_length=254),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='company',
|
||||
name='phone',
|
||||
field=phonenumber_field.modelfields.PhoneNumberField(blank=True, verbose_name='phone', max_length=128),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='company',
|
||||
name='postcode',
|
||||
field=models.CharField(blank=True, verbose_name='postcode', max_length=10),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='company',
|
||||
name='street',
|
||||
field=models.CharField(blank=True, verbose_name='street', max_length=60),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='company',
|
||||
name='website',
|
||||
field=models.CharField(blank=True, verbose_name='website', max_length=64),
|
||||
),
|
||||
]
|
||||
@ -7,6 +7,8 @@ from django.conf import settings
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.template import defaultfilters
|
||||
|
||||
from phonenumber_field.modelfields import PhoneNumberField
|
||||
|
||||
from decimal import Decimal
|
||||
from core.models import User, SithFile
|
||||
from club.models import Club
|
||||
@ -32,6 +34,13 @@ class CurrencyField(models.DecimalField):
|
||||
|
||||
class Company(models.Model):
|
||||
name = models.CharField(_('name'), max_length=60)
|
||||
street = models.CharField(_('street'), max_length=60, blank=True)
|
||||
city = models.CharField(_('city'), max_length=60, blank=True)
|
||||
postcode = models.CharField(_('postcode'), max_length=10, blank=True)
|
||||
country = models.CharField(_('country'), max_length=32, blank=True)
|
||||
phone = PhoneNumberField(_('phone'), blank=True)
|
||||
email = models.EmailField(_('email'), blank=True)
|
||||
website = models.CharField(_('website'), max_length=64, blank=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("company")
|
||||
|
||||
Reference in New Issue
Block a user