diff --git a/project/docs/as_xls/render_to_xls.py b/project/docs/as_xls/render_to_xls.py index ebf02ad..bc9a528 100644 --- a/project/docs/as_xls/render_to_xls.py +++ b/project/docs/as_xls/render_to_xls.py @@ -24,6 +24,8 @@ XLS_ROOT = getattr(settings, 'XLS_ROOT', '/') DEBUG = getattr(settings, 'DEBUG', False) +del_rows = [] + def render_xls_to_string(request, xls_template, dictionary=None): """Создает по шаблону новую книгу Excel. @@ -176,9 +178,11 @@ def fill_xls(request, dictionary, src_sheet, dst_sheet, style_list, xls_settings val = new_value, src_row = row, src_col = col, - commands = {'draw_thin_bottom_border': cmd_draw_thin_bottom_border,} + commands = {'draw_thin_bottom_border': cmd_draw_thin_bottom_border, + } ) + # --- конец цикла по ячейкам в строке # подобрать высоту строки в ячейках diff --git a/project/docs/forms/__init__.py b/project/docs/forms/__init__.py index f805a31..d7456d1 100644 --- a/project/docs/forms/__init__.py +++ b/project/docs/forms/__init__.py @@ -6,4 +6,4 @@ from .aktsverki import AktSverkiForm, AktSverkiAdminForm, AktSverkiItemForm, Akt from .dover import DoverForm, DoverAdminForm, DoverItemForm, DoverItemAdminForm from .platejka import PlatejkaForm, PlatejkaAdminForm from .nakladn import NakladnForm, NakladnAdminForm, NakladnItemForm, NakladnItemAdminForm -from .faktura import FakturaForm, FakturaAdminForm, FakturaItemForm, FakturaItemAdminForm, PlatDocItemForm +from .faktura import FakturaForm, FakturaAdminForm, FakturaItemForm, FakturaItemAdminForm diff --git a/project/docs/forms/base_forms.py b/project/docs/forms/base_forms.py index bb010c6..c7f3089 100644 --- a/project/docs/forms/base_forms.py +++ b/project/docs/forms/base_forms.py @@ -36,6 +36,8 @@ class BaseModelForm(MyBaseModelForm): # Настроить атрибуты виджетов # TODO вынести в _MySuperForm (сделать там настройку полей с datepicker-ами из словаря) f['doc_date'].widget.attrs['class'] = 'has-datepicker' + f['plat_doc_date'].widget.attrs['class'] = 'has-datepicker' + f['fix_doc_date'].widget.attrs['class'] = 'has-datepicker' # Если в форме есть поле bank_account, настроить связь с BankAccount: чтобы можно было выбрать __только__ # расчетные счета данного пользователя. Также убрать пустой вариант из селекта. diff --git a/project/docs/forms/faktura.py b/project/docs/forms/faktura.py index 1be57d1..ee9385b 100644 --- a/project/docs/forms/faktura.py +++ b/project/docs/forms/faktura.py @@ -5,7 +5,7 @@ import autocomplete_light from project.commons.forms import MyBaseModelForm from .base_forms import BaseModelForm -from ..models import Faktura, FakturaItem, PlatDoc +from ..models import Faktura, FakturaItem from project.customer.models import Client @@ -20,6 +20,8 @@ class FakturaForm(BaseModelForm): class Meta: model = Faktura fields = ('doc_num', 'doc_date', + 'plat_doc_num', 'plat_doc_date', + 'fix_doc_num', 'fix_doc_date', 'bank_account', 'client', 'invoice', 'doc_reason', 'nds_value', @@ -59,13 +61,3 @@ class FakturaItemAdminForm(FakturaItemForm): class Meta(FakturaItemForm.Meta): exclude = None - -class PlatDocItemForm(MyBaseModelForm): - """Форма редактирования платёжных документов.""" - class Meta: - model = PlatDoc - exclude = ['parent'] - - widgets = { - 'doc_date': forms.TextInput(attrs={'class': 'has-datepicker'}), - } diff --git a/project/docs/migrations/0008_auto__del_field_platejka_nds_type.py b/project/docs/migrations/0008_auto__del_field_platejka_nds_type.py new file mode 100644 index 0000000..8e9f713 --- /dev/null +++ b/project/docs/migrations/0008_auto__del_field_platejka_nds_type.py @@ -0,0 +1,324 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Deleting field 'Platejka.nds_type' + db.delete_column(u'docs_platejka', 'nds_type') + + + def backwards(self, orm): + # Adding field 'Platejka.nds_type' + db.add_column(u'docs_platejka', 'nds_type', + self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=1), + keep_default=False) + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'customer.bankaccount': { + 'Meta': {'ordering': "['-created_at']", 'object_name': 'BankAccount'}, + 'account': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'bik': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_main': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'korr_account': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bank_accounts'", 'to': u"orm['auth.User']"}) + }, + u'customer.client': { + 'Meta': {'ordering': "['name', '-created_at']", 'object_name': 'Client'}, + 'address': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'bank_account': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'bank_address': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'bank_bik': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '10', 'blank': 'True'}), + 'bank_korr_account': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'bank_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'contact_email': ('django.db.models.fields.EmailField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_icq': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'contact_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_other': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'contact_phone': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_skype': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'inn': ('django.db.models.fields.CharField', [], {'max_length': '12'}), + 'kpp': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '9', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256', 'db_index': 'True'}), + 'okpo': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '10', 'blank': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'clients'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktrabot': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'AktRabot'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktrabotitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'AktRabotItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'aktrabot_items'", 'to': "orm['docs.AktRabot']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.aktsverki': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'AktSverki'}, + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_mesto': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'end_date': ('django.db.models.fields.DateField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'saldo_credit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'saldo_debit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'start_date': ('django.db.models.fields.DateField', [], {}), + 'total_credit': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'total_debit': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'total_saldo': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktsverkiitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'AktSverkiItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'credit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'debit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'aktsverki_items'", 'to': "orm['docs.AktSverki']"}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.country': { + 'Meta': {'object_name': 'Country'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.currency': { + 'Meta': {'object_name': 'Currency'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.dover': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Dover'}, + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_expire_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'dover_doc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_doc_date': ('django.db.models.fields.DateField', [], {}), + 'dover_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_passport_date': ('django.db.models.fields.DateField', [], {}), + 'dover_passport_num': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'dover_passport_org': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_passport_ser': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.doveritem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'DoverItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dover_items'", 'to': "orm['docs.Dover']"}), + 'qty': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.faktura': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Faktura'}, + 'avance': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['docs.Currency']", 'null': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_reason': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + 'fixes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'receiver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'receiver_fakturas'", 'null': 'True', 'to': u"orm['customer.Client']"}), + 'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sender_fakturas'", 'null': 'True', 'to': u"orm['customer.Client']"}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}), + 'user_is_sender': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'docs.fakturaitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'FakturaItem'}, + 'country_code': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'country_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'gtd': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'faktura_items'", 'to': "orm['docs.Faktura']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'units_kod': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.invoice': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Invoice'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'closed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'paid_status': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.invoiceitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'InvoiceItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invoice_items'", 'to': "orm['docs.Invoice']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.measure': { + 'Meta': {'object_name': 'Measure'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.nakladn': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Nakladn'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_reason': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.nakladnitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'NakladnItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nakladn_items'", 'to': "orm['docs.Nakladn']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.platdoc': { + 'Meta': {'object_name': 'PlatDoc'}, + 'doc_date': ('django.db.models.fields.DateField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'num': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'plat_docs'", 'to': "orm['docs.Faktura']"}) + }, + 'docs.platejka': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Platejka'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_info': ('django.db.models.fields.TextField', [], {'max_length': '1000'}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_total': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'payment_order': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'payment_type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'platej_type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'tax_base': ('django.db.models.fields.CharField', [], {'default': "u'\\u0422\\u041f'", 'max_length': '10'}), + 'tax_bk': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'tax_num': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'tax_okato': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_period': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_status': ('django.db.models.fields.CharField', [], {'default': "u'01'", 'max_length': '10'}), + 'tax_type': ('django.db.models.fields.CharField', [], {'default': "u'\\u041d\\u0421'", 'max_length': '10'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + } + } + + complete_apps = ['docs'] \ No newline at end of file diff --git a/project/docs/migrations/0009_auto__add_field_faktura_ntd.py b/project/docs/migrations/0009_auto__add_field_faktura_ntd.py new file mode 100644 index 0000000..eefa864 --- /dev/null +++ b/project/docs/migrations/0009_auto__add_field_faktura_ntd.py @@ -0,0 +1,325 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Faktura.ntd' + db.add_column(u'docs_faktura', 'ntd', + self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Faktura.ntd' + db.delete_column(u'docs_faktura', 'ntd') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'customer.bankaccount': { + 'Meta': {'ordering': "['-created_at']", 'object_name': 'BankAccount'}, + 'account': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'bik': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_main': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'korr_account': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bank_accounts'", 'to': u"orm['auth.User']"}) + }, + u'customer.client': { + 'Meta': {'ordering': "['name', '-created_at']", 'object_name': 'Client'}, + 'address': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'bank_account': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'bank_address': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'bank_bik': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '10', 'blank': 'True'}), + 'bank_korr_account': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'bank_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'contact_email': ('django.db.models.fields.EmailField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_icq': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'contact_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_other': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'contact_phone': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_skype': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'inn': ('django.db.models.fields.CharField', [], {'max_length': '12'}), + 'kpp': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '9', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256', 'db_index': 'True'}), + 'okpo': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '10', 'blank': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'clients'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktrabot': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'AktRabot'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktrabotitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'AktRabotItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'aktrabot_items'", 'to': "orm['docs.AktRabot']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.aktsverki': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'AktSverki'}, + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_mesto': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'end_date': ('django.db.models.fields.DateField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'saldo_credit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'saldo_debit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'start_date': ('django.db.models.fields.DateField', [], {}), + 'total_credit': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'total_debit': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'total_saldo': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktsverkiitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'AktSverkiItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'credit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'debit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'aktsverki_items'", 'to': "orm['docs.AktSverki']"}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.country': { + 'Meta': {'object_name': 'Country'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.currency': { + 'Meta': {'object_name': 'Currency'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.dover': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Dover'}, + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_expire_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'dover_doc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_doc_date': ('django.db.models.fields.DateField', [], {}), + 'dover_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_passport_date': ('django.db.models.fields.DateField', [], {}), + 'dover_passport_num': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'dover_passport_org': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_passport_ser': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.doveritem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'DoverItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dover_items'", 'to': "orm['docs.Dover']"}), + 'qty': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.faktura': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Faktura'}, + 'avance': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['docs.Currency']", 'null': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_reason': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + 'fixes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'ntd': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'receiver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'receiver_fakturas'", 'null': 'True', 'to': u"orm['customer.Client']"}), + 'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sender_fakturas'", 'null': 'True', 'to': u"orm['customer.Client']"}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}), + 'user_is_sender': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'docs.fakturaitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'FakturaItem'}, + 'country_code': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'country_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'gtd': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'faktura_items'", 'to': "orm['docs.Faktura']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'units_kod': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.invoice': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Invoice'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'closed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'paid_status': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.invoiceitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'InvoiceItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invoice_items'", 'to': "orm['docs.Invoice']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.measure': { + 'Meta': {'object_name': 'Measure'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.nakladn': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Nakladn'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_reason': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.nakladnitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'NakladnItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nakladn_items'", 'to': "orm['docs.Nakladn']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.platdoc': { + 'Meta': {'object_name': 'PlatDoc'}, + 'doc_date': ('django.db.models.fields.DateField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'num': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'plat_docs'", 'to': "orm['docs.Faktura']"}) + }, + 'docs.platejka': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Platejka'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_info': ('django.db.models.fields.TextField', [], {'max_length': '1000'}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_total': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'payment_order': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'payment_type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'platej_type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'tax_base': ('django.db.models.fields.CharField', [], {'default': "u'\\u0422\\u041f'", 'max_length': '10'}), + 'tax_bk': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'tax_num': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'tax_okato': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_period': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_status': ('django.db.models.fields.CharField', [], {'default': "u'01'", 'max_length': '10'}), + 'tax_type': ('django.db.models.fields.CharField', [], {'default': "u'\\u041d\\u0421'", 'max_length': '10'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + } + } + + complete_apps = ['docs'] \ No newline at end of file diff --git a/project/docs/migrations/0010_auto__del_field_faktura_ntd__add_field_fakturaitem_ntd.py b/project/docs/migrations/0010_auto__del_field_faktura_ntd__add_field_fakturaitem_ntd.py new file mode 100644 index 0000000..2ae3d2b --- /dev/null +++ b/project/docs/migrations/0010_auto__del_field_faktura_ntd__add_field_fakturaitem_ntd.py @@ -0,0 +1,333 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Deleting field 'Faktura.ntd' + db.delete_column(u'docs_faktura', 'ntd') + + # Adding field 'FakturaItem.ntd' + db.add_column(u'docs_fakturaitem', 'ntd', + self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Adding field 'Faktura.ntd' + db.add_column(u'docs_faktura', 'ntd', + self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True), + keep_default=False) + + # Deleting field 'FakturaItem.ntd' + db.delete_column(u'docs_fakturaitem', 'ntd') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'customer.bankaccount': { + 'Meta': {'ordering': "['-created_at']", 'object_name': 'BankAccount'}, + 'account': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'bik': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_main': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'korr_account': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bank_accounts'", 'to': u"orm['auth.User']"}) + }, + u'customer.client': { + 'Meta': {'ordering': "['name', '-created_at']", 'object_name': 'Client'}, + 'address': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'bank_account': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'bank_address': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'bank_bik': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '10', 'blank': 'True'}), + 'bank_korr_account': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'bank_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'contact_email': ('django.db.models.fields.EmailField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_icq': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'contact_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_other': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'contact_phone': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_skype': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'inn': ('django.db.models.fields.CharField', [], {'max_length': '12'}), + 'kpp': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '9', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256', 'db_index': 'True'}), + 'okpo': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '10', 'blank': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'clients'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktrabot': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'AktRabot'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktrabotitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'AktRabotItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'aktrabot_items'", 'to': "orm['docs.AktRabot']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.aktsverki': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'AktSverki'}, + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_mesto': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'end_date': ('django.db.models.fields.DateField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'saldo_credit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'saldo_debit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'start_date': ('django.db.models.fields.DateField', [], {}), + 'total_credit': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'total_debit': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'total_saldo': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktsverkiitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'AktSverkiItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'credit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'debit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'aktsverki_items'", 'to': "orm['docs.AktSverki']"}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.country': { + 'Meta': {'object_name': 'Country'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.currency': { + 'Meta': {'object_name': 'Currency'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.dover': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Dover'}, + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_expire_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'dover_doc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_doc_date': ('django.db.models.fields.DateField', [], {}), + 'dover_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_passport_date': ('django.db.models.fields.DateField', [], {}), + 'dover_passport_num': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'dover_passport_org': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_passport_ser': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.doveritem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'DoverItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dover_items'", 'to': "orm['docs.Dover']"}), + 'qty': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.faktura': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Faktura'}, + 'avance': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['docs.Currency']", 'null': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_reason': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + 'fixes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'receiver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'receiver_fakturas'", 'null': 'True', 'to': u"orm['customer.Client']"}), + 'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sender_fakturas'", 'null': 'True', 'to': u"orm['customer.Client']"}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}), + 'user_is_sender': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'docs.fakturaitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'FakturaItem'}, + 'country_code': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'country_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'gtd': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'ntd': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'faktura_items'", 'to': "orm['docs.Faktura']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'units_kod': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.invoice': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Invoice'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'closed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'paid_status': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.invoiceitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'InvoiceItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invoice_items'", 'to': "orm['docs.Invoice']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.measure': { + 'Meta': {'object_name': 'Measure'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.nakladn': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Nakladn'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_reason': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.nakladnitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'NakladnItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nakladn_items'", 'to': "orm['docs.Nakladn']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.platdoc': { + 'Meta': {'object_name': 'PlatDoc'}, + 'doc_date': ('django.db.models.fields.DateField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'num': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'plat_docs'", 'to': "orm['docs.Faktura']"}) + }, + 'docs.platejka': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Platejka'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_info': ('django.db.models.fields.TextField', [], {'max_length': '1000'}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_total': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'payment_order': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'payment_type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'platej_type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'tax_base': ('django.db.models.fields.CharField', [], {'default': "u'\\u0422\\u041f'", 'max_length': '10'}), + 'tax_bk': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'tax_num': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'tax_okato': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_period': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_status': ('django.db.models.fields.CharField', [], {'default': "u'01'", 'max_length': '10'}), + 'tax_type': ('django.db.models.fields.CharField', [], {'default': "u'\\u041d\\u0421'", 'max_length': '10'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + } + } + + complete_apps = ['docs'] \ No newline at end of file diff --git a/project/docs/migrations/0011_auto__del_platdoc__add_field_faktura_plat_doc_num__add_field_faktura_p.py b/project/docs/migrations/0011_auto__del_platdoc__add_field_faktura_plat_doc_num__add_field_faktura_p.py new file mode 100644 index 0000000..ab6a8eb --- /dev/null +++ b/project/docs/migrations/0011_auto__del_platdoc__add_field_faktura_plat_doc_num__add_field_faktura_p.py @@ -0,0 +1,340 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Deleting model 'PlatDoc' + db.delete_table(u'docs_platdoc') + + # Adding field 'Faktura.plat_doc_num' + db.add_column(u'docs_faktura', 'plat_doc_num', + self.gf('django.db.models.fields.CharField')(default='', max_length=30, blank=True), + keep_default=False) + + # Adding field 'Faktura.plat_doc_date' + db.add_column(u'docs_faktura', 'plat_doc_date', + self.gf('django.db.models.fields.DateField')(null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Adding model 'PlatDoc' + db.create_table(u'docs_platdoc', ( + ('num', self.gf('django.db.models.fields.CharField')(max_length=30)), + ('doc_date', self.gf('django.db.models.fields.DateField')()), + ('parent', self.gf('django.db.models.fields.related.ForeignKey')(related_name='plat_docs', to=orm['docs.Faktura'])), + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + )) + db.send_create_signal('docs', ['PlatDoc']) + + # Deleting field 'Faktura.plat_doc_num' + db.delete_column(u'docs_faktura', 'plat_doc_num') + + # Deleting field 'Faktura.plat_doc_date' + db.delete_column(u'docs_faktura', 'plat_doc_date') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'customer.bankaccount': { + 'Meta': {'ordering': "['-created_at']", 'object_name': 'BankAccount'}, + 'account': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'bik': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_main': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'korr_account': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bank_accounts'", 'to': u"orm['auth.User']"}) + }, + u'customer.client': { + 'Meta': {'ordering': "['name', '-created_at']", 'object_name': 'Client'}, + 'address': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'bank_account': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'bank_address': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'bank_bik': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '10', 'blank': 'True'}), + 'bank_korr_account': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'bank_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'contact_email': ('django.db.models.fields.EmailField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_icq': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'contact_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_other': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'contact_phone': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_skype': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'inn': ('django.db.models.fields.CharField', [], {'max_length': '12'}), + 'kpp': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '9', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256', 'db_index': 'True'}), + 'okpo': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '10', 'blank': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'clients'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktrabot': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'AktRabot'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktrabotitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'AktRabotItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'aktrabot_items'", 'to': "orm['docs.AktRabot']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.aktsverki': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'AktSverki'}, + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_mesto': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'end_date': ('django.db.models.fields.DateField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'saldo_credit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'saldo_debit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'start_date': ('django.db.models.fields.DateField', [], {}), + 'total_credit': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'total_debit': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'total_saldo': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktsverkiitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'AktSverkiItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'credit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'debit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'aktsverki_items'", 'to': "orm['docs.AktSverki']"}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.country': { + 'Meta': {'object_name': 'Country'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.currency': { + 'Meta': {'object_name': 'Currency'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.dover': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Dover'}, + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_expire_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'dover_doc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_doc_date': ('django.db.models.fields.DateField', [], {}), + 'dover_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_passport_date': ('django.db.models.fields.DateField', [], {}), + 'dover_passport_num': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'dover_passport_org': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_passport_ser': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.doveritem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'DoverItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dover_items'", 'to': "orm['docs.Dover']"}), + 'qty': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.faktura': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Faktura'}, + 'avance': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['docs.Currency']", 'null': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_reason': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + 'fixes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'plat_doc_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'plat_doc_num': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '30', 'blank': 'True'}), + 'receiver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'receiver_fakturas'", 'null': 'True', 'to': u"orm['customer.Client']"}), + 'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sender_fakturas'", 'null': 'True', 'to': u"orm['customer.Client']"}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}), + 'user_is_sender': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'docs.fakturaitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'FakturaItem'}, + 'country_code': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'country_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'gtd': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'ntd': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'faktura_items'", 'to': "orm['docs.Faktura']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'units_kod': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.invoice': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Invoice'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'closed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'paid_status': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.invoiceitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'InvoiceItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invoice_items'", 'to': "orm['docs.Invoice']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.measure': { + 'Meta': {'object_name': 'Measure'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.nakladn': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Nakladn'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_reason': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.nakladnitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'NakladnItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nakladn_items'", 'to': "orm['docs.Nakladn']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.platejka': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Platejka'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_info': ('django.db.models.fields.TextField', [], {'max_length': '1000'}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_total': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'payment_order': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'payment_type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'platej_type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'tax_base': ('django.db.models.fields.CharField', [], {'default': "u'\\u0422\\u041f'", 'max_length': '10'}), + 'tax_bk': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'tax_num': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'tax_okato': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_period': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_status': ('django.db.models.fields.CharField', [], {'default': "u'01'", 'max_length': '10'}), + 'tax_type': ('django.db.models.fields.CharField', [], {'default': "u'\\u041d\\u0421'", 'max_length': '10'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + } + } + + complete_apps = ['docs'] \ No newline at end of file diff --git a/project/docs/migrations/0012_auto__add_field_faktura_fix_doc_num__add_field_faktura_fix_doc_date.py b/project/docs/migrations/0012_auto__add_field_faktura_fix_doc_num__add_field_faktura_fix_doc_date.py new file mode 100644 index 0000000..672d1e3 --- /dev/null +++ b/project/docs/migrations/0012_auto__add_field_faktura_fix_doc_num__add_field_faktura_fix_doc_date.py @@ -0,0 +1,330 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Faktura.fix_doc_num' + db.add_column(u'docs_faktura', 'fix_doc_num', + self.gf('django.db.models.fields.PositiveIntegerField')(max_length=30, null=True), + keep_default=False) + + # Adding field 'Faktura.fix_doc_date' + db.add_column(u'docs_faktura', 'fix_doc_date', + self.gf('django.db.models.fields.DateField')(null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Faktura.fix_doc_num' + db.delete_column(u'docs_faktura', 'fix_doc_num') + + # Deleting field 'Faktura.fix_doc_date' + db.delete_column(u'docs_faktura', 'fix_doc_date') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'customer.bankaccount': { + 'Meta': {'ordering': "['-created_at']", 'object_name': 'BankAccount'}, + 'account': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'address': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'bik': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_main': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'korr_account': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bank_accounts'", 'to': u"orm['auth.User']"}) + }, + u'customer.client': { + 'Meta': {'ordering': "['name', '-created_at']", 'object_name': 'Client'}, + 'address': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'bank_account': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'bank_address': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'bank_bik': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '10', 'blank': 'True'}), + 'bank_korr_account': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'bank_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'contact_email': ('django.db.models.fields.EmailField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_icq': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'contact_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_other': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'contact_phone': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'contact_skype': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'inn': ('django.db.models.fields.CharField', [], {'max_length': '12'}), + 'kpp': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '9', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256', 'db_index': 'True'}), + 'okpo': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '10', 'blank': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'clients'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktrabot': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'AktRabot'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktrabotitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'AktRabotItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'aktrabot_items'", 'to': "orm['docs.AktRabot']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.aktsverki': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'AktSverki'}, + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_mesto': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'end_date': ('django.db.models.fields.DateField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'saldo_credit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'saldo_debit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'start_date': ('django.db.models.fields.DateField', [], {}), + 'total_credit': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'total_debit': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'total_saldo': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.aktsverkiitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'AktSverkiItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'credit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + 'debit': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'aktsverki_items'", 'to': "orm['docs.AktSverki']"}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.country': { + 'Meta': {'object_name': 'Country'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.currency': { + 'Meta': {'object_name': 'Currency'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.dover': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Dover'}, + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_expire_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'dover_doc': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_doc_date': ('django.db.models.fields.DateField', [], {}), + 'dover_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_passport_date': ('django.db.models.fields.DateField', [], {}), + 'dover_passport_num': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'dover_passport_org': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'dover_passport_ser': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.doveritem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'DoverItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dover_items'", 'to': "orm['docs.Dover']"}), + 'qty': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.faktura': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Faktura'}, + 'avance': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'currency': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['docs.Currency']", 'null': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_reason': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + 'fix_doc_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'fix_doc_num': ('django.db.models.fields.PositiveIntegerField', [], {'max_length': '30', 'null': 'True'}), + 'fixes': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'plat_doc_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'plat_doc_num': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '30', 'blank': 'True'}), + 'receiver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'receiver_fakturas'", 'null': 'True', 'to': u"orm['customer.Client']"}), + 'sender': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'sender_fakturas'", 'null': 'True', 'to': u"orm['customer.Client']"}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}), + 'user_is_sender': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'docs.fakturaitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'FakturaItem'}, + 'country_code': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'country_name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'gtd': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'ntd': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'faktura_items'", 'to': "orm['docs.Faktura']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'units_kod': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.invoice': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Invoice'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'closed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'paid_status': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.invoiceitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'InvoiceItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invoice_items'", 'to': "orm['docs.Invoice']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.measure': { + 'Meta': {'object_name': 'Measure'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '10'}) + }, + 'docs.nakladn': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Nakladn'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_reason': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), + 'doc_text': ('django.db.models.fields.TextField', [], {'default': "''", 'max_length': '1000', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'invoice': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['docs.Invoice']"}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'signed_status': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + }, + 'docs.nakladnitem': { + 'Meta': {'ordering': "('created_at',)", 'object_name': 'NakladnItem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nakladn_items'", 'to': "orm['docs.Nakladn']"}), + 'price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'qty': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '3'}), + 'total_price': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + 'units': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'docs.platejka': { + 'Meta': {'ordering': "('-doc_date',)", 'object_name': 'Platejka'}, + 'bank_account': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.BankAccount']"}), + 'client': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['customer.Client']"}), + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'doc_date': ('django.db.models.fields.DateField', [], {}), + 'doc_info': ('django.db.models.fields.TextField', [], {'max_length': '1000'}), + 'doc_num': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'doc_total': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '2'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nds_value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '0'}), + 'payment_order': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'payment_type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'platej_type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '1'}), + 'tax_base': ('django.db.models.fields.CharField', [], {'default': "u'\\u0422\\u041f'", 'max_length': '10'}), + 'tax_bk': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'tax_num': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'tax_okato': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_period': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'tax_status': ('django.db.models.fields.CharField', [], {'default': "u'01'", 'max_length': '10'}), + 'tax_type': ('django.db.models.fields.CharField', [], {'default': "u'\\u041d\\u0421'", 'max_length': '10'}), + 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['auth.User']"}) + } + } + + complete_apps = ['docs'] \ No newline at end of file diff --git a/project/docs/models/__init__.py b/project/docs/models/__init__.py index 311edc3..0c28ab7 100644 --- a/project/docs/models/__init__.py +++ b/project/docs/models/__init__.py @@ -5,4 +5,4 @@ from .aktsverki import AktSverki, AktSverkiItem from .dover import Dover, DoverItem from .platejka import Platejka from .nakladn import Nakladn, NakladnItem -from .faktura import Faktura, FakturaItem, PlatDoc +from .faktura import Faktura, FakturaItem diff --git a/project/docs/models/faktura.py b/project/docs/models/faktura.py index 2554ee6..231b896 100644 --- a/project/docs/models/faktura.py +++ b/project/docs/models/faktura.py @@ -16,6 +16,10 @@ class Faktura(BaseInvoiceModel, SignedStatusFieldMixin, InvoiceFieldMixin): user_is_sender = models.BooleanField(u'пользователь - отправитель', default=False) sender = models.ForeignKey(Client, related_name='sender_fakturas', blank=True, null=True, verbose_name=u'Отправитель') receiver = models.ForeignKey(Client, related_name='receiver_fakturas', blank=True, null=True, verbose_name=u'Получатель') + plat_doc_num = models.CharField(u'Номер платёжного документа', max_length=30, blank=True, default='') + plat_doc_date = models.DateField('Дата платёжного документа', blank=True, null=True) + fix_doc_num = models.PositiveIntegerField(u'Номер исправления', max_length=30, null=True, blank=True) + fix_doc_date = models.DateField('Дата исправления', blank=True, null=True) def get_consignor_and_address(self): """Отправитель и адрес @@ -24,7 +28,7 @@ class Faktura(BaseInvoiceModel, SignedStatusFieldMixin, InvoiceFieldMixin): if self.user_is_sender: return u'%s, %s' % (self.user.profile.get_company_name(), self.user.profile.address) elif self.sender: - return '%s, %s' % self.sender.name, self.sender.address + return '%s, %s' % (self.sender.name, self.sender.address) else: return u'' @@ -50,6 +54,7 @@ class FakturaItem(BaseItemInvoiceModel): country_code = models.CharField(u'Код страны', max_length=10) country_name = models.CharField(u'Название страны', max_length=256) gtd = models.CharField(u'Основание', max_length=256, blank=True, default='') + ntd = models.CharField(u'Номер транспортной декларации', max_length=256, blank=True, default='') #measure = models.ForeignKey(Measure, related_name='m_faktura_items') class Meta(BaseItemInvoiceModel.Meta): @@ -58,13 +63,13 @@ class FakturaItem(BaseItemInvoiceModel): app_label="docs" -class PlatDoc(models.Model): - """Платёжные документы""" - parent = models.ForeignKey(Faktura, related_name='plat_docs') - num = models.CharField(u'Номер', max_length=30) - doc_date = models.DateField('Дата') - - class Meta: - verbose_name = u'Платёжный документ' - verbose_name_plural = u'Платёжные документы' - app_label="docs" +#class PlatDoc(models.Model): +# """Платёжные документы""" +# parent = models.ForeignKey(Faktura, related_name='plat_docs') +# num = models.CharField(u'Номер', max_length=30) +# doc_date = models.DateField('Дата') +# +# class Meta: +# verbose_name = u'Платёжный документ' +# verbose_name_plural = u'Платёжные документы' +# app_label="docs" diff --git a/project/docs/urls.py b/project/docs/urls.py index 591a6ae..368ae68 100644 --- a/project/docs/urls.py +++ b/project/docs/urls.py @@ -72,7 +72,7 @@ urlpatterns += patterns('docs.views', # создать по Счету -> Накладную url(r'^%s/add/by/invoice/(?P\d+)/$' % 'nakladn', getview, {'klass': NakladnViews, 'oper': 'add_by_invoice',}, name='docs_%s_add_by_invoice' % 'nakladn'), -# # создать по Счету -> Счёт-фактуру -# url(r'^%s/add/by/invoice/(?P\d+)/$' % 'sfv', getview, {'klass': SfvViews, 'oper': 'add_by_invoice',}, -# name='docs_%s_add_by_invoice' % 'sfv'), + # создать по Счету -> Счёт-фактуру + url(r'^%s/add/by/invoice/(?P\d+)/$' % 'faktura', getview, {'klass': FakturaViews, 'oper': 'add_by_invoice',}, + name='docs_%s_add_by_invoice' % 'faktura'), ) diff --git a/project/docs/views/base_views.py b/project/docs/views/base_views.py index bee6792..5a4b59b 100644 --- a/project/docs/views/base_views.py +++ b/project/docs/views/base_views.py @@ -516,7 +516,6 @@ class BaseItemsViews(BaseViews): def __init__(self, request): super(BaseItemsViews, self).__init__(request) self.set_item_formset_class() - self.pformset = None def asserts(self): """Проверить объект класса на типичные ошибки.""" @@ -559,10 +558,6 @@ class BaseItemsViews(BaseViews): """ if self.request.method == 'POST' and '_cancel' in self.request.POST: return redirect(self.REDIRECT_AFTER_ADD) - if self.pformset: - pformset = self.pformset(self.request.POST or None) - else: - pformset = None receiver_choice = None sender_choice = None @@ -574,7 +569,7 @@ class BaseItemsViews(BaseViews): receiver_choice = form.data.get('receiver_group', None) sender_choice = form.data.get('sender_group', None) - if form.is_valid() and formset.is_valid() and ((not pformset) or (pformset and pformset.is_valid())): + if form.is_valid() and formset.is_valid(): new_obj = form.save(commit=False) new_obj.user = self.request.user new_obj.save() @@ -584,12 +579,6 @@ class BaseItemsViews(BaseViews): for item in new_items: item.parent = new_obj item.save() - if pformset and pformset.is_valid(): - new_items = pformset.save(commit=False) - for item in new_items: - item.parent = new_obj - item.save() - self.update_parent_on_items_save(new_obj, new_items) return redirect(self.REDIRECT_AFTER_ADD) else: initial = kwargs.get('initial') or self.init_form() @@ -605,7 +594,6 @@ class BaseItemsViews(BaseViews): 'form_template_js': self.TEMPLATE_FORM_JS, 'form': form, 'formset': formset, - 'pformset': pformset, 'client_form': ClientForm(), 'receiver_choice': receiver_choice, 'sender_choice': sender_choice, @@ -672,15 +660,10 @@ class BaseItemsViews(BaseViews): else: receiver_choice = 'nobody' - if self.pformset: - pformset = self.pformset(self.request.POST or None, instance=obj) - else: - pformset = None - formset = self.ITEM_FORMSET_CLASS(self.request.POST or None, prefix=self.ITEM_FORM_PREFIX, instance=obj) form = self.FORM_CLASS(self.request.user, data=self.request.POST or None, instance=obj) - if form.is_valid() and formset.is_valid() and ((not pformset) or (pformset and pformset.is_valid())): + if form.is_valid() and formset.is_valid(): new_obj = form.save() # По сути - для фактуры. @@ -708,12 +691,6 @@ class BaseItemsViews(BaseViews): item.parent = new_obj item.save() self.update_parent_on_items_save(new_obj, items) - if pformset and pformset.is_valid(): - items = pformset.save(commit=False) - for item in items: - item.parent = new_obj - item.save() - self.update_parent_on_items_save(new_obj, items) return redirect(self.REDIRECT_AFTER_EDIT) dictionary = { @@ -725,7 +702,6 @@ class BaseItemsViews(BaseViews): 'obj': obj, 'form': form, 'formset': formset, - 'pformset': pformset, 'client_form': ClientForm(), 'receiver_choice': receiver_choice, 'sender_choice': sender_choice, diff --git a/project/docs/views/faktura.py b/project/docs/views/faktura.py index d53453e..e951d44 100644 --- a/project/docs/views/faktura.py +++ b/project/docs/views/faktura.py @@ -6,8 +6,8 @@ from django.utils.decorators import method_decorator from django.views.decorators.csrf import csrf_protect from django.forms.models import inlineformset_factory -from ..models import Faktura, FakturaItem, PlatDoc -from ..forms import FakturaForm, FakturaItemForm, PlatDocItemForm +from ..models import Faktura, FakturaItem +from ..forms import FakturaForm, FakturaItemForm from .. import utils from .base_views import BaseItemsViews @@ -153,11 +153,3 @@ class FakturaViews(BaseItemsViews, AddByInvoiceMethodMixin): item.pdf_pagebreak_after = True # print 'curr_rows =', curr_rows - def __init__(self, request): - super(FakturaViews, self).__init__(request) - self.pformset = inlineformset_factory( - parent_model = self.MODEL, - model = PlatDoc, - form = PlatDocItemForm, - extra=1 - ) diff --git a/project/static/css/style.css b/project/static/css/style.css index d0cb266..caaad46 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -32,6 +32,8 @@ ul.messagelist li { ul.messagelist li.warning { background-image: url(../img/icon-alert.gif); } ul.messagelist li.error { background-image: url(../img/icon-error.gif); } +.hidden {display:none; } + .errorlist { font-size: 8pt; overflow: hidden; } .errorlist li { color: red; } @@ -142,11 +144,15 @@ a.delete { vertical-align: top; } .doc-form #nds_type { padding-top: 16px; } .doc-form #nds_type ul li { float: left; } -.doc-form table.list td.name input[type=text] { width: 334px; } +.doc-form table.list td.name input[type=text] { width: 284px; } .doc-form table.list td.qty input[type=text] { width: 68px; } .doc-form table.list td.units input[type=text] { width: 50px; } +.doc-form table.list td.units_kod input[type=text] { width: 20px; } .doc-form table.list td.price input[type=text] { width: 72px; } .doc-form table.list td.total_price input[type=text] { width: 84px; } +.doc-form table.list td.country_code input[type=text] { width: 24px; } +.doc-form table.list td.country_name input[type=text] { width: 84px; } +.doc-form table.list td.ntd input[type=text] { width: 84px; } .doc-form table.list.aktsverki td.name input[type=text] { width: 432px; } .doc-form table.list.aktsverki td.debit input[type=text] { width: 96px; } diff --git a/project/templates/docs/_base/base_list.html b/project/templates/docs/_base/base_list.html index 0c15f4d..25e8307 100644 --- a/project/templates/docs/_base/base_list.html +++ b/project/templates/docs/_base/base_list.html @@ -50,7 +50,7 @@ {% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %} {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %} - {% url 'docs_sfv_add_by_invoice' iinvoice_idd=obj.pk as url_sfv_by_invoice %} + {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %} {% block table_obj_cells %} @@ -89,7 +89,7 @@ {% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %} {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %} - {% url 'docs_sfv_add_by_invoice' iinvoice_idd=obj.pk as url_sfv_by_invoice %} + {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %} diff --git a/project/templates/docs/faktura/as_pdf2.html b/project/templates/docs/faktura/as_pdf2.html new file mode 100644 index 0000000..d2c3589 --- /dev/null +++ b/project/templates/docs/faktura/as_pdf2.html @@ -0,0 +1,625 @@ +{% load my_tags pytils_numeral pytils_dt %} + + + + + + + + + +
+ Унифицированная форма № ТОРГ-12. Утверждена постановлением Госкомстата России от 25.12.98 № 132 +
+ +{# шапка документа #} +
+ + {# строка 1 #} + + + + + + + + + + + + + {# строка 2 #} + + + + + {# строка 3 #} + + + + + + {# строка 4 #} + + + + + + {# строка 5 #} + + + + {# строка 6 #} + + + + + + {# строка 7 #} + + + + + + + + {# строка 8 #} + + + + + + + {# строка 9 #} + + + + + + + {# строка 10 #} + + + + + + + {# строка 11 #} + + + + + + + {# строка 12 #} + + + + + + + {# строка 13 #} + + + + + + {# строка 14 #} + + + + + + + {# строка 15 #} + + + + {# строка 16 #} + + + + + + {# строка 17 #} + + + + + + + + + {# строка 18 #} + + + + + + + + +
Код
Форма по ОКУД0330212
+ {{ profile.get_company_name|safe }} , {{ profile.address|safe }} , + ИНН {{ profile.get_inn_and_kpp }} , тел. {{ profile.get_full_phone }} , + р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }} , + {{ obj.bank_account.address|safe }} , БИК {{ obj.bank_account.bik }} , + корр/с {{ obj.bank_account.korr_account }} + по ОКПО{{ profile.ip_kod_okpo }}
+ (организация-грузоотправитель, адрес, телефон, факс, банковские реквизиты) +
 
(структурное подразделение)Вид деятельности по ОКДП
Грузополучатель + {{ obj.client.name|safe }} , {{ obj.client.address|safe }} , + ИНН {{ obj.client.get_inn_and_kpp }} , + тел. {{ obj.client.contact_phone }} , + р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }} , + {{ obj.client.bank_address|safe }} , БИК {{ obj.client.bank_bik }} , + корр/с {{ obj.client.bank_korr_account }} + по ОКПО{{ obj.client.kod_okpo }}
(организация, адрес, телефон, факс, банковские реквизиты){{ profile.ip_kod_okpo }}
Поставщик + {{ profile.get_company_name|safe }} , {{ profile.address|safe }} , + ИНН {{ profile.get_inn_and_kpp }} , тел. {{ profile.get_full_phone }} , + р/с {{ obj.bank_account.account }} в {{ obj.bank_account.name|safe }} , + {{ obj.bank_account.address|safe }} , БИК {{ obj.bank_account.bik }} , + корр/с {{ obj.bank_account.korr_account }} + по ОКПО
(организация, адрес, телефон, факс, банковские реквизиты){{ obj.client.kod_okpo }}
Плательщик + {{ obj.client.name|safe }} , {{ obj.client.address|safe }} , + ИНН {{ obj.client.get_inn_and_kpp }} , + тел. {{ obj.client.contact_phone }} , + р/с {{ obj.client.bank_account }} в {{ obj.client.bank_name|safe }} , + {{ obj.client.bank_address|safe }} , БИК {{ obj.client.bank_bik }} , + корр/с {{ obj.client.bank_korr_account }} + по ОКПО
(организация, адрес, телефон, факс, банковские реквизиты)номер
Основание
(договор, заказ-наряд)дата
Счёт-фактураномер
Номер документаДата составлениядата
ТОВАРНАЯ НАКЛАДНАЯ{{ obj.doc_num }}{{ obj.doc_date|date:"d.m.Y" }}Вид операции
+
+ +
+ +
+ +{% for item in obj_items %} + {% if forloop.first %} {# шапка табл., если первая запись #} + {% if item.pdf_pagebreak_before %} {# разрыв страницы перед таблицей #} + + {% endif %} + + {% include "docs/nakladn/as_pdf_items_tbl_header.html" %} + {% endif %} + + {# данные #} + + {# 1 #} + {# 2 #} + {# 3 #} + {# 4 #} + {# 5 #} + {# 6 #} + {# 7 #} + {# 8 #} + {# 9 #} + {# 10 #} + {# 11 #} + {# 12 #} + {# 13 #} + {# 14 #} + {# 15 #} + + + {% if item.pdf_page_footer %} {# подитог #} + + {# 1-2 #} + {# 3 #} + {# 4 #} + {# 5 #} + {# 6 #} + {# 7 #} + {# 8 #} + {# 9 #} + {# 10 #} + {# 11 #} + {# 12 #} + {# 13 #} + {# 14 #} + {# 15 #} + + {% endif %} + + {% if forloop.last %} {# всего по таблице, если последняя запись #} + + {# 1-7 #} + {# 8 #} + {# 9 #} + {# 10 #} + {# 11 #} + {# 12 #} + {# 13 #} + {# 14 #} + {# 15 #} + +
{{ forloop.counter }}{{ item.name|safe }}{{ item.units|safe }}{{ item.qty }}{{ item.clean_price}}{{ item.clean_total_price|floatformat:2 }}{{ obj.get_nds_as_number }}{{ item.total_nds|floatformat:2 }}{{ item.full_total_price|floatformat:2 }}
Итого{{ item.sum_qty|floatformat:3 }}X{{ item.sum_clean_total_price|floatformat:2 }}X{{ item.sum_total_nds|floatformat:2 }}{{ item.sum_full_total_price|floatformat:2 }}
Всего по накладной{{ obj.sum_qty|floatformat:3 }}X{{ obj.sum_clean_total_price|floatformat:2 }}X{{ obj.sum_total_nds|floatformat:2 }}{{ obj.sum_full_total_price|floatformat:2 }}
+ {% if item.pdf_pagebreak_after %} {# разрыв страницы после всей таблицы #} + + {% endif %} + {% endif %} + + {% if not forloop.last %} + {% if item.pdf_pagebreak_after %} {# разрыв страницы после записи #} + + + {# перевывести шапку табл. #} + {% include "docs/nakladn/as_pdf_items_tbl_header.html" %} + {% endif %} + {% endif %} +{% endfor %} + + + +{# подвал документа #} + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Товарная накладная имеет приложение налистах
и содержит{{ obj_items|length|in_words }}порядковых номеров записей
(прописью)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

 
Масса груза (нетто)
(прописью) 
Всего местМасса груза (брутто)
(прописью)(прописью)
+ + + + + + + + + + + + + + {# правая половина #} + + + + + + + + + + + + + + + + + + + {# правая половина #} + + + + + + + + + + + + + + + + {# правая половина #} + + + + + + + + + {# правая половина #} + + + + + + + + + {# правая половина #} + + + + + + + + + + {# правая половина #} + + + + + + {# правая половина #} + + + +
 
Приложение (паспорта, сертификаты и т.п.) налистахПо доверенности №от «»года,
(прописью) 
Всего отпущено на суммувыданной
(прописью)(кем, кому (организация, должность, фамилия, и., о.))
руб.коп. 
  
+ + + + + + + + + + + + {# правая половина #} + + + + + + + + + + + + + + + + + + + {# правая половина #} + + + + + + + + + + + + {# правая половина #} + + + + + + + + + + + {# правая половина #} + + + + + + + + + + + + + + + + {# правая половина #} + + + + + + + + + + + + + + + + + {# правая половина #} + + + + + + + + + + + + + + + + + {# правая половина #} + + + + + + + + + + + {# правая половина #} + + +
  
Отпуск груза разрешил{{ profile.get_boss_fio }} 
(должность)(подпись)(расшифровка подписи) 
Главный (старший) бухгалтер{{ profile.get_glavbuh_fio }}Груз принял
(подпись)(расшифровка подписи)(должность)(подпись)(расшифровка подписи)
Отпуск груза произвелГруз получил грузополучатель
(должность)(подпись)(расшифровка подписи)(должность)(подпись)(расшифровка подписи)
  
+ + + + + + + + + + + + + + {# правая половина #} + + + + + + + + + + + + +
М.П.«»годаМ.П.«»года
+
+ + + diff --git a/project/templates/docs/faktura/as_pdf_items_tbl_header.html b/project/templates/docs/faktura/as_pdf_items_tbl_header2.html similarity index 100% rename from project/templates/docs/faktura/as_pdf_items_tbl_header.html rename to project/templates/docs/faktura/as_pdf_items_tbl_header2.html diff --git a/project/templates/docs/faktura/form.html b/project/templates/docs/faktura/form.html index 98d2181..8e52aba 100644 --- a/project/templates/docs/faktura/form.html +++ b/project/templates/docs/faktura/form.html @@ -8,11 +8,16 @@ {% include 'docs/parts/form_field.html' with field=form.doc_date id="doc_date" classes="left" label="Дата создания" required="True" %}
- {% include 'docs/parts/faktura_form_plat_doc_items.html' %} + {% include 'docs/parts/form_field.html' with field=form.plat_doc_num id="plat_doc_num" classes="left" label="Номер платёжного документа" required="True" no_clear_after="True" %} + {% include 'docs/parts/form_field.html' with field=form.plat_doc_date id="plat_doc_date" classes="left" label="Дата платёжного документа" required="True" %}
{% include 'docs/parts/form_field.html' with field=form.fixes id="fixes" label="Исправления" no_clear_after="True" label_inline="True" %} +
+ {% include 'docs/parts/form_field.html' with field=form.fix_doc_num id="fix_doc_num" classes="left" label="Номер исправления" required="True" no_clear_after="True" %} + {% include 'docs/parts/form_field.html' with field=form.fix_doc_date id="fix_doc_date" classes="left" label="Дата исправления" required="True" %} +
{% include 'docs/parts/form_field.html' with field=form.avance id="avance" label="Аванс" no_clear_after="True" label_inline="True" %} {% include 'docs/parts/form_field.html' with field=form.bank_account id="bank_account" classes="field" label="Расчётный счёт" %} {% include 'docs/parts/form_field_client.html' with field=form.client required="True" is_ajax="True" %} diff --git a/project/templates/docs/invoice/list.html b/project/templates/docs/invoice/list.html index 7a1a817..9ddfebe 100644 --- a/project/templates/docs/invoice/list.html +++ b/project/templates/docs/invoice/list.html @@ -15,7 +15,5 @@
Накладную

- {% comment %}Счёт-фактуру -
{% endcomment %} - Счёт-фактуру
+ Счёт-фактуру
{% endblock %} diff --git a/project/templates/docs/parts/faktura_form_plat_doc_items.html b/project/templates/docs/parts/faktura_form_plat_doc_items.html deleted file mode 100644 index d4cff68..0000000 --- a/project/templates/docs/parts/faktura_form_plat_doc_items.html +++ /dev/null @@ -1,31 +0,0 @@ -{# табличная часть документа #} - - - - - - - - - {% for pform in pformset.forms %} - - - - {{ pform.id }} - - - {% endfor %} - -
К плат. документуОт
- {{ pform.num.errors }} - {{ pform.num }} - - {{ pform.doc_date.errors }} - {{ pform.doc_date }} - - {{ pform.DELETE }} -
- -{{ pformset.management_form }} - -
diff --git a/project/templates/docs/parts/faktura_form_tbl_items.html b/project/templates/docs/parts/faktura_form_tbl_items.html index 09395ef..6995852 100644 --- a/project/templates/docs/parts/faktura_form_tbl_items.html +++ b/project/templates/docs/parts/faktura_form_tbl_items.html @@ -2,12 +2,13 @@ - + + @@ -47,6 +48,10 @@ {{ iform.country_name.errors }} {{ iform.country_name }} + diff --git a/project/templates/docs/stub_js.html b/project/templates/docs/stub_js.html index b32f956..f2c0bb0 100644 --- a/project/templates/docs/stub_js.html +++ b/project/templates/docs/stub_js.html @@ -104,5 +104,15 @@ }) }) + if ($('#id_fixes').is(':checked')){ + $('#fix_block').show(); + } else { + $('#fix_block').hide(); + } + $('#id_fixes').change(function(){ + $('#fix_block').toggle(); + $('#id_fix_doc_num').val(''); + $('#id_fix_doc_date').val(''); + }) }); diff --git a/project/urls.py b/project/urls.py index c0d0dea..8baa039 100644 --- a/project/urls.py +++ b/project/urls.py @@ -30,5 +30,10 @@ urlpatterns = patterns('', url(r'^', include('cms.urls')), ) + if settings.DEBUG: - urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + urlpatterns += patterns('', + url(r'^m/(?P.*)$', 'django.views.static.serve', { + 'document_root': settings.MEDIA_ROOT, + }), + ) diff --git a/project/xls_templates/faktura.xls b/project/xls_templates/faktura.xls index 0fc2582..e35cba1 100644 Binary files a/project/xls_templates/faktura.xls and b/project/xls_templates/faktura.xls differ diff --git a/project/xls_templates/invoice.xls b/project/xls_templates/invoice.xls index 93cdde7..aee4c3d 100644 Binary files a/project/xls_templates/invoice.xls and b/project/xls_templates/invoice.xls differ
НаименованиеНаименование Ед. изм. Кол-во Цена Сумма Страна№ таможенной декларации Удалить
+ {{ iform.ntd.errors }} + {{ iform.ntd }} + {% if iform.instance.pk %}{{ iform.DELETE }}{% endif %}