From 92010fa685b3dbb0edd09b7a28c4427509110a3e Mon Sep 17 00:00:00 2001 From: Bachurin Sergey Date: Thu, 17 Jul 2014 17:59:51 +0300 Subject: [PATCH] faktura change form, xls uodate --- project/docs/as_xls/render_to_xls.py | 6 +- project/docs/forms/__init__.py | 2 +- project/docs/forms/base_forms.py | 2 + project/docs/forms/faktura.py | 14 +- .../0008_auto__del_field_platejka_nds_type.py | 324 +++++++++ .../0009_auto__add_field_faktura_ntd.py | 325 +++++++++ ..._faktura_ntd__add_field_fakturaitem_ntd.py | 333 ++++++++++ ...ktura_plat_doc_num__add_field_faktura_p.py | 340 ++++++++++ ...doc_num__add_field_faktura_fix_doc_date.py | 330 +++++++++ project/docs/models/__init__.py | 2 +- project/docs/models/faktura.py | 27 +- project/docs/urls.py | 6 +- project/docs/views/base_views.py | 28 +- project/docs/views/faktura.py | 12 +- project/static/css/style.css | 8 +- project/templates/docs/_base/base_list.html | 4 +- project/templates/docs/faktura/as_pdf.html | 59 +- project/templates/docs/faktura/as_pdf2.html | 625 ++++++++++++++++++ ...der.html => as_pdf_items_tbl_header2.html} | 0 project/templates/docs/faktura/form.html | 7 +- project/templates/docs/invoice/list.html | 4 +- .../parts/faktura_form_plat_doc_items.html | 31 - .../docs/parts/faktura_form_tbl_items.html | 7 +- project/templates/docs/stub_js.html | 10 + project/urls.py | 7 +- project/xls_templates/faktura.xls | Bin 44032 -> 24576 bytes project/xls_templates/invoice.xls | Bin 25600 -> 16896 bytes 27 files changed, 2364 insertions(+), 149 deletions(-) create mode 100644 project/docs/migrations/0008_auto__del_field_platejka_nds_type.py create mode 100644 project/docs/migrations/0009_auto__add_field_faktura_ntd.py create mode 100644 project/docs/migrations/0010_auto__del_field_faktura_ntd__add_field_fakturaitem_ntd.py create mode 100644 project/docs/migrations/0011_auto__del_platdoc__add_field_faktura_plat_doc_num__add_field_faktura_p.py create mode 100644 project/docs/migrations/0012_auto__add_field_faktura_fix_doc_num__add_field_faktura_fix_doc_date.py create mode 100644 project/templates/docs/faktura/as_pdf2.html rename project/templates/docs/faktura/{as_pdf_items_tbl_header.html => as_pdf_items_tbl_header2.html} (100%) delete mode 100644 project/templates/docs/parts/faktura_form_plat_doc_items.html 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 0fc25828c8e8d06feed299201f759515268b501d..e35cba1b22a0221b1b891088d2a1b3b8c34099b4 100644 GIT binary patch literal 24576 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 literal 25600 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�YA>{%~2|#`w7(4&y`Pj@*$yk-PFO6_~ms|Auf} zg*(`{Vyu;~z%#$2d@Ku+I=%`05c-*1h5KP`E|}xPaNXs{#w=>1*b!I{4_7zZviI;Yc`Gb+{noHHX1kK3 zbyIS*734Vlq2EtiAy@q7Q1e{@|rTwPyL?#c5an(|hp3(?RFx=Mh)`xE_uA4qoJ3M@ZQc4`SGh z+PBkEaoGnkv>j1fLC!&pX&-(#i)LD|AI7aqKaAT+ei*ls{4n-VKaATrei$v^4`c7~ z!`Nf|Fdj1bVH^qkFdoGCVLWv4!>BVqjN1x+7<<1TM#tO_B@!hjTPvhSBIa>Zel?G+ z7Q(2e%W-3wdA+J!HFz|tG^wyH8?n))`BAnI#%rBo`-R{x=oDM75!-V*MVUevcQuDv zn?s-CKwcq?={k=amW1@HJjxVOf9po6>vZ00ODc~gLg1mxHQ43e8Ks;JN@}(uQ^X0W z(VJAbMYURY;)Jl>r>X4n9bmnB|_?$g*112@>n8-c}thuW9MmEXbB;; zjlpvG6H`S~=g}fK6Y3P7oWbxl05(hRp{c)N)S`83mD_h%y*a7|J~va@+>;`&T#UN1{7edkjb#~&I|BEGfq2Se{Y(C=qH@yy+OZy8W$`6_Fm ztbwuy${HwZpsazi2Fe;JYoM%wvIfc;C~Kgs0cceQ$qR_wM@b^m@1IAc&z?u5zkdsndoW)>T%Nu@zX73N zPoJIsyZ+Kc`}q8NgJ=Hq^PfWGcNp~bxgWsqC-|KNzlYF&Xu@y%^qD^YXMlzGR>U^M z1BmU29f$`JncsWBZ%FIJ%|xR=D&x?XZhN^2KZa>{4F*Mf26~o1zN%{+;8OC zg|9~(?zAJTMsKd%*F+|RXtB*4`19btgr5w$qU5;dfY<%R{{SfPryT1o_#eX>vr;ar zAC=%wNwDtcpau7D&+(^JGHVd+1b_A+_Mi3g=hswfgA9*K{Mn-Shb=ZH&%h??f5^rE FzXA8v>Jk6|
НаименованиеНаименование Ед. изм. Кол-во Цена Сумма Страна№ таможенной декларации Удалить
+ {{ iform.ntd.errors }} + {{ iform.ntd }} + {% if iform.instance.pk %}{{ iform.DELETE }}{% endif %}