rename source dir

diff_static.sh

@@ -5,7 +5,7 @@
 ALL=$1
 
 PROD_STATIC="_public_html/static"
-DEV_STATIC="project/static"
+DEV_STATIC="src/static"
 
 if [ "$ALL" = "--all" ]; then
     EXCLUDE=""

manage.py

@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "src.settings")
 
     from django.core.management import execute_from_command_line
 

project/templates/docs/parts/doc_actions.html

@@ -1,17 +0,0 @@
-{% url url_prefix|add:'img' id=obj.pk as url_img %}
-{% url url_prefix|add:'pdf' id=obj.pk as url_pdf %}
-{% url url_prefix|add:'xls' id=obj.pk as url_xls %}
-
-<div class="doc-panel-header">Скачать документ</div>
-
-{% if not images %}
-    <a class="doc look-link" href="{{ url_img }}">Предпросмотр {{ padeji.rodit }}</a>
-{% endif %}
-
-<div class="clear"></div>
-
-<a class="doc pdf-link left" href="{{ url_pdf }}">Документ в PDF</a>
-
-<a class="doc excel-link left" href="{{ url_xls }}"> Документ в Excel</a>
-
-<div class="clear"></div>

project/templates/docs/parts/doc_actions2nd.html

@@ -1,13 +0,0 @@
-{% url url_prefix|add:'edit' id=obj.pk as url_edit %}
-{% url url_prefix|add:'delete' id=obj.pk as url_delete %}
-{% url url_prefix|add:'email' id=obj.pk as url_email %}
-
-<div class="doc-panel-header">Действия с документом</div>
-
-<a class="doc email-link" href="{{ url_email }}">Отправить по e-mail</a>
-
-<a class="doc edit-link" href="{{ url_edit }}">Редактировать документ</a>
-
-<a class="doc delete-link" href="{{ url_delete }}">Удалить документ</a>
-
-<div class="clear"></div>

project/templates/docs/parts/form_buttons.html

@@ -1,9 +0,0 @@
-<div class="buttons">
-    {% if not is_ajax %}
-        <input class="btn save_btn" type="submit" name="submit" value="Сохранить {{ padeji.imenit }}" />
-        <input type="submit" name="_cancel" value="Отмена" />
-    {% else %}
-        <button type="submit" role="button" name="submit">Сохранить</button>
-        <button class="close-form" type="button" role="close" name="close-form">Отмена</button>
-    {% endif %}
-</div>

project/templates/docs/parts/form_client_choices.html

@@ -1,4 +0,0 @@
-<p>{{ label }}</p>
-<input type="radio" name="{{ client_group|default:'client_group' }}" value="he_is"{% if default == 'he_is' %} checked{% endif %}> {{ label1|default:'Он же' }}
-<input type="radio" name="{{ client_group|default:'client_group' }}" value="another"{% if default == 'another' %} checked{% endif %}>{{ label2|default:'Стороннее лицо' }}
-<input type="radio" name="{{ client_group|default:'client_group' }}" value="nobody"{% if default == 'nobody' %} checked{% endif %}> Не указывать

project/templates/docs/parts/form_field.html

@@ -1,23 +0,0 @@
-{% comment %}
-field - поле
-id - id поля
-classes - css классы
-required - отметить, что поле обязательное?
-label - заголовок поля
-label_inline - вывести заголовок и поле на одной строке?
-help - подсказка по заполнению поля
-is_ajax - ajax-форма?
-no_clear_after - не добавлять очистку float после блока
-{% endcomment %}
-
-<div{% if id %} id="{{ id }}"{% endif %}{% if classes %} class="{{ classes }}"{% endif %}>
-    {% if label %}{{ label }}:{% if required %} <span class="required">*</span>{% endif %}{% endif %}
-    {% if label_inline %}
-        {{ field }}
-    {% else %}
-        <p>{{ field }}</p>
-    {% endif %}
-    {% if help %}<p><span class="help-text">{{ help }}</span></p>{% endif %}
-    {% if not is_ajax %}{{ field.errors }}{% endif %}
-</div>
-{% if not no_clear_after %}<div class="clear"></div>{% endif %}

project/templates/docs/parts/form_field_client.html

@@ -1,22 +0,0 @@
-{% comment %}
-field - поле
-required - отметить, что поле обязательное?
-label - заголовок поля (по умолчанию, `Контрагент`)
-is_ajax - ajax-форма?
-no_clear_after - не добавлять очистку float после блока
-{% endcomment %}
-
-
-<div id={{ id|default:"client" }} class="field">
-    {{ label|default:"Контрагент" }}:{% if required %} <span class="required">*</span>{% endif %}
-    <p>
-        {{ field }}
-        <a class="client add-client-link" href="{% url 'customer_clients_add' %}" title="Добавить контрагента">
-            Добавить контрагента
-        </a>
-    </p>
-
-    {{ form.client.errors }}
-    {% if not is_ajax %}{{ form.client.errors }}{% endif %}
-</div>
-{% if not no_clear_after %}<div class="clear"></div>{% endif %}

project/templates/docs/parts/form_field_receiver.html

@@ -1,3 +0,0 @@
-{% include 'docs/parts/form_client_choices.html' with client_group="receiver_group" id="receiver_choices" classes="field" label="Получатель" default=receiver_choice %}
-
-{% include 'docs/parts/form_field_client.html' with field=form.receiver id="receiver" classes="field" label="Получатель" %}

project/templates/docs/parts/form_field_sender.html

@@ -1,2 +0,0 @@
-{% include 'docs/parts/form_client_choices.html' with client_group="sender_group" id="sender_choices" classes="field" label="Отправитель" label1='Подставить мои данные' default=sender_choice %}
-{% include 'docs/parts/form_field_client.html' with field=form.sender id="sender" classes="field" label="Отправитель" %}

project/templates/docs/parts/form_tbl_items.html

@@ -1,53 +0,0 @@
-{# табличная часть документа #}
-
-<table id="tbl_items" class="doc-list">
-    <tr>
-        <th>Наименование:</th>
-        <th>Количество:</th>
-        <th>Ед. изм.:</th>
-        <th>Цена:</th>
-        <th>Сумма:</th>
-        <th></th>
-    </tr>
-
-    {% for iform in formset %}
-        <tr class="row_tbl_items row {% cycle 'even' 'odd' %}" {% if iform.DELETE.value %}style='display:none;'{% endif %}>
-            {% for field in iform %}
-                {% if field.name == "id" or field.name == "parent" %}
-                    {{ field }}
-                {% else %}
-                    {% if field.name != "DELETE" %}
-                        <td class="{{ field.name }}">
-                            {{ field.errors }}
-                            {{ field }}
-                        </td>
-                    {% endif %}
-                {% endif %}
-            {% endfor %}
-            <td class="DELETE center">
-                {% if iform.instance.pk %}<span style='display:none;'>{{ iform.DELETE }}</span>{% endif %}
-            </td>
-        </tr>
-    {% endfor %}
-
-    <tr>
-        <td colspan="3">
-        </td>
-        <td class="itogo-td itogo-td1"><span>Итого</span></td>
-        <td class="itogo-td itogo-td2"><span id="itogo"></span></td>
-        <td></td>
-    </tr>
-
-    {% comment %}
-    <tr>
-        <td colspan="3"></td>
-        <td align="right"><b id="itogo_nds_text">Без НДС</b></td>
-        <td><b id="itogo_nds"></b></td>
-        <td></td>
-    </tr>
-    {% endcomment %}
-</table>
-
-{{ formset.management_form }}
-
-<div class="clear"></div>

project/templates/docs/parts/invoice_create_docs.html

@@ -1,9 +0,0 @@
-{% 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_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %}
-
-<a href="{{ url_aktrabot_by_invoice }}" title="Акт по счёту" class="invoice-add-doc doc">Акт выполненных работ</a>
-
-<a href="{{ url_nakladn_by_invoice }}" title="Накладную" class="doc invoice-add-doc ">Накладную</a>
-
-<a href="{{ url_faktura_by_invoice }}" title="Счёт-фактуру" class="invoice-add-doc doc">Счёт-фактуру</a>

project/templates/docs/parts/linked_docs_list.html

@@ -1,21 +0,0 @@
-{% if obj.linked_docs %}
-
-<div class="doc-panel-header">Связанные документы</div>
-
-{% for invoice in obj.linked_docs.Invoice %}
-    <a href="{% url 'docs_invoice_img' invoice.id %}" class="doc">{{ invoice }}</a>
-{% endfor %}
-
-{% for akt in obj.linked_docs.AktRabot %}
-    <a href="{% url 'docs_aktrabot_img' akt.id %}" class="doc">{{ akt }}</a>
-{% endfor %}
-
-{% for nakladn in obj.linked_docs.Nakladn %}
-    <a href="{% url 'docs_nakladn_img' nakladn.id %}" class="doc">{{ nakladn }}</a>
-{% endfor %}
-
-{% for faktura in obj.linked_docs.Faktura %}
-    <a href="{% url 'docs_faktura_img' faktura.id %}" class="doc">{{ faktura }}</a>
-{% endfor %}
-
-{% endif %}

src/celery.py

@@ -3,9 +3,9 @@ import os
 from celery import Celery
 
 # set the default Django settings module for the 'celery' program.
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'project.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'src.settings')
 
-app = Celery('project')
+app = Celery('src')
 
 # Using a string here means the worker doesn't have to serialize
 # the configuration object to child processes.

src/customer/!!forms.py

@@ -5,7 +5,7 @@ from django.utils.safestring import mark_safe
 from django.conf import settings
 
 from yandex_money.forms import PaymentForm
-from project.commons.forms import MyBaseModelForm, set_field_error
+from commons.forms import MyBaseModelForm, set_field_error
 
 from . import consts, models
 

src/customer/models.py

@@ -12,7 +12,7 @@ from django.core.urlresolvers import reverse
 
 from customer import consts, managers, utils
 from myauth.models import DokUser
-from project.commons.utils import only_numerics
+from commons.utils import only_numerics
 
 
 PROFILE_IMAGES_UPLOAD_DIR = 'customer/profile/' # куда сохранять загруженные изображения

src/customer/views/bank_accounts.py

@@ -4,7 +4,7 @@ from django.core.urlresolvers import reverse
 from django.views.decorators.csrf import csrf_protect
 from django.contrib.auth.decorators import login_required
 
-from project.commons.paginator import pagination, save_per_page_value
+from commons.paginator import pagination, save_per_page_value
 
 from .. import models, forms
 from ..decorators import license_required 

src/customer/views/bank_accounts_ajax.py

@@ -8,7 +8,7 @@ from django.views.decorators.csrf import csrf_protect
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
 
-from project.commons.utils import dthandler
+from commons.utils import dthandler
 
 from .. import models, forms
 from ..decorators import license_required 

src/customer/views/clients.py

@@ -3,7 +3,7 @@ from django.shortcuts import render, redirect, get_object_or_404
 from django.views.decorators.csrf import csrf_protect
 from django.contrib.auth.decorators import login_required
 
-from project.commons.paginator import pagination, save_per_page_value
+from commons.paginator import pagination, save_per_page_value
 
 from .. import models, forms
 from ..decorators import license_required

src/customer/views/profile.py

@@ -17,7 +17,7 @@ from django.http import Http404, HttpResponse
 # from sorl.thumbnail import get_thumbnail
 from easy_thumbnails.files import get_thumbnailer
 
-from project.commons.pdf_tools import render_pdf_to_string, pdf_to_response
+from commons.pdf_tools import render_pdf_to_string, pdf_to_response
 
 from customer import models, forms
 from customer.decorators import license_required

src/docs/forms/aktrabot.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django import forms
 
-from project.commons.forms import MyBaseModelForm
+from commons.forms import MyBaseModelForm
 
 from .base_forms import BaseModelForm
 from ..models import AktRabot, AktRabotItem

src/docs/forms/aktsverki.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django import forms
 
-from project.commons.forms import MyBaseModelForm
+from commons.forms import MyBaseModelForm
 
 from .base_forms import BaseModelForm
 from ..models import AktSverki, AktSverkiItem

src/docs/forms/dover.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django import forms
 
-from project.commons.forms import MyBaseModelForm
+from commons.forms import MyBaseModelForm
 
 from .base_forms import BaseModelForm
 from ..models import Dover, DoverItem

src/docs/forms/invoice.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django import forms
 
-from project.commons.forms import MyBaseModelForm
+from commons.forms import MyBaseModelForm
 
 from docs.forms.base_forms import BaseModelForm
 from docs.models import Invoice, InvoiceItem

src/docs/forms/nakladn.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django import forms
 
-from project.commons.forms import MyBaseModelForm
+from commons.forms import MyBaseModelForm
 
 from .base_forms import BaseModelForm
 from ..models import Nakladn, NakladnItem

src/docs/forms/platejka.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from django import forms
 
-from project.commons.forms import set_field_error
+from commons.forms import set_field_error
 
 from .base_forms import BaseModelForm
 from ..models import Platejka