cursor-agent/watersurf-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature: тёмная тема, минималистичный UI, улучшения UX

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
cursor-agent
2026-02-25 15:22:18 +00:00
parent a181413dda
commit a684bede12
18 changed files with 860 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/templates/documents/cash_doc_form.html
View File

@@ -1,11 +1,21 @@
{% extends "base.html" %}
{% block title %}{{ title }} — ERP WaterSurf{% endblock %}
{% block content %}
<h2>{% if object %}Редактировать{% else %}Создать{% endif %} {{ title }}</h2>
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<button type="submit" class="btn btn-primary">Сохранить</button>
<a href="{{ cancel_url|default:'#' }}" class="btn btn-secondary">Отмена</a>
</form>
<div class="ws-card">
<h2 class="ws-page-title">{% if object %}Редактировать{% else %}Создать{% endif %} {{ title }}</h2>
<form method="post" class="ws-form-card">
{% csrf_token %}
{% for field in form %}
<div class="ws-form-group">
<label for="{{ field.id_for_label }}">{{ field.label }}</label>
{{ field }}
{% if field.errors %}<small class="ws-text-danger">{{ field.errors.0 }}</small>{% endif %}
</div>
{% endfor %}
<div class="ws-btn-group" style="margin-top: 1.25rem;">
<button type="submit" class="btn btn-ws-primary">Сохранить</button>
<a href="{{ cancel_url|default:'#' }}" class="btn btn-ws-secondary">Отмена</a>
</div>
</form>
</div>
{% endblock %}

69
app/templates/documents/cash_expense_list.html
View File

@@ -1,35 +1,42 @@
{% extends "base.html" %}
{% block title %}Расходы денежных средств — ERP WaterSurf{% endblock %}
{% block content %}
<h2>Расходы денежных средств</h2>
<p><a href="{% url 'documents:cash_expense_create' %}" class="btn btn-primary">Создать</a></p>
<table class="table table-striped">
<thead>
<tr>
<th>Дата</th>
<th>Номер</th>
<th>Отправитель</th>
<th>Сумма</th>
<th>Заказ поставщику</th>
<th></th>
</tr>
</thead>
<tbody>
{% for obj in object_list %}
<tr>
<td>{{ obj.date }}</td>
<td>{{ obj.number }}</td>
<td>{{ obj.sender }}</td>
<td>{{ obj.amount }}</td>
<td>{{ obj.supplier_order|default:"—" }}</td>
<td>
<a href="{% url 'documents:cash_expense_edit' obj.pk %}">Изменить</a>
| <a href="{% url 'documents:cash_expense_delete' obj.pk %}" class="text-danger">Удалить</a>
</td>
</tr>
{% empty %}
<tr><td colspan="6">Нет расходов.</td></tr>
{% endfor %}
</tbody>
</table>
<div class="ws-card">
<div class="ws-card-header">
<h2 class="ws-page-title mb-0">Расходы денежных средств</h2>
<a href="{% url 'documents:cash_expense_create' %}" class="btn btn-ws-primary">Создать</a>
</div>
<div class="ws-table-wrap">
<table class="ws-table">
<thead>
<tr>
<th>Дата</th>
<th>Номер</th>
<th>Отправитель</th>
<th class="ws-num">Сумма</th>
<th>Заказ поставщику</th>
<th></th>
</tr>
</thead>
<tbody>
{% for obj in object_list %}
<tr>
<td>{{ obj.date }}</td>
<td>{{ obj.number }}</td>
<td>{{ obj.sender }}</td>
<td class="ws-num">{{ obj.amount }}</td>
<td>{{ obj.supplier_order|default:"—" }}</td>
<td class="ws-actions">
<a href="{% url 'documents:cash_expense_edit' obj.pk %}" class="ws-link">Изменить</a>
<span class="ws-text-muted"> · </span>
<a href="{% url 'documents:cash_expense_delete' obj.pk %}" class="ws-link ws-link-danger">Удалить</a>
</td>
</tr>
{% empty %}
<tr><td colspan="6" class="ws-empty">Нет расходов.</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
{% endblock %}

69
app/templates/documents/cash_inflow_list.html
View File

@@ -1,35 +1,42 @@
{% extends "base.html" %}
{% block title %}Поступления денежных средств — ERP WaterSurf{% endblock %}
{% block content %}
<h2>Поступления денежных средств</h2>
<p><a href="{% url 'documents:cash_inflow_create' %}" class="btn btn-primary">Создать</a></p>
<table class="table table-striped">
<thead>
<tr>
<th>Дата</th>
<th>Номер</th>
<th>Получатель</th>
<th>Сумма</th>
<th>Заказ клиента</th>
<th></th>
</tr>
</thead>
<tbody>
{% for obj in object_list %}
<tr>
<td>{{ obj.date }}</td>
<td>{{ obj.number }}</td>
<td>{{ obj.recipient }}</td>
<td>{{ obj.amount }}</td>
<td>{{ obj.customer_order|default:"—" }}</td>
<td>
<a href="{% url 'documents:cash_inflow_edit' obj.pk %}">Изменить</a>
| <a href="{% url 'documents:cash_inflow_delete' obj.pk %}" class="text-danger">Удалить</a>
</td>
</tr>
{% empty %}
<tr><td colspan="6">Нет поступлений.</td></tr>
{% endfor %}
</tbody>
</table>
<div class="ws-card">
<div class="ws-card-header">
<h2 class="ws-page-title mb-0">Поступления денежных средств</h2>
<a href="{% url 'documents:cash_inflow_create' %}" class="btn btn-ws-primary">Создать</a>
</div>
<div class="ws-table-wrap">
<table class="ws-table">
<thead>
<tr>
<th>Дата</th>
<th>Номер</th>
<th>Получатель</th>
<th class="ws-num">Сумма</th>
<th>Заказ клиента</th>
<th></th>
</tr>
</thead>
<tbody>
{% for obj in object_list %}
<tr>
<td>{{ obj.date }}</td>
<td>{{ obj.number }}</td>
<td>{{ obj.recipient }}</td>
<td class="ws-num">{{ obj.amount }}</td>
<td>{{ obj.customer_order|default:"—" }}</td>
<td class="ws-actions">
<a href="{% url 'documents:cash_inflow_edit' obj.pk %}" class="ws-link">Изменить</a>
<span class="ws-text-muted"> · </span>
<a href="{% url 'documents:cash_inflow_delete' obj.pk %}" class="ws-link ws-link-danger">Удалить</a>
</td>
</tr>
{% empty %}
<tr><td colspan="6" class="ws-empty">Нет поступлений.</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
{% endblock %}

69
app/templates/documents/cash_transfer_list.html
View File

@@ -1,35 +1,42 @@
{% extends "base.html" %}
{% block title %}Перемещения денежных средств — ERP WaterSurf{% endblock %}
{% block content %}
<h2>Перемещения денежных средств</h2>
<p><a href="{% url 'documents:cash_transfer_create' %}" class="btn btn-primary">Создать</a></p>
<table class="table table-striped">
<thead>
<tr>
<th>Дата</th>
<th>Номер</th>
<th>Отправитель</th>
<th>Получатель</th>
<th>Сумма</th>
<th></th>
</tr>
</thead>
<tbody>
{% for obj in object_list %}
<tr>
<td>{{ obj.date }}</td>
<td>{{ obj.number }}</td>
<td>{{ obj.sender }}</td>
<td>{{ obj.recipient }}</td>
<td>{{ obj.amount }}</td>
<td>
<a href="{% url 'documents:cash_transfer_edit' obj.pk %}">Изменить</a>
| <a href="{% url 'documents:cash_transfer_delete' obj.pk %}" class="text-danger">Удалить</a>
</td>
</tr>
{% empty %}
<tr><td colspan="6">Нет перемещений.</td></tr>
{% endfor %}
</tbody>
</table>
<div class="ws-card">
<div class="ws-card-header">
<h2 class="ws-page-title mb-0">Перемещения денежных средств</h2>
<a href="{% url 'documents:cash_transfer_create' %}" class="btn btn-ws-primary">Создать</a>
</div>
<div class="ws-table-wrap">
<table class="ws-table">
<thead>
<tr>
<th>Дата</th>
<th>Номер</th>
<th>Отправитель</th>
<th>Получатель</th>
<th class="ws-num">Сумма</th>
<th></th>
</tr>
</thead>
<tbody>
{% for obj in object_list %}
<tr>
<td>{{ obj.date }}</td>
<td>{{ obj.number }}</td>
<td>{{ obj.sender }}</td>
<td>{{ obj.recipient }}</td>
<td class="ws-num">{{ obj.amount }}</td>
<td class="ws-actions">
<a href="{% url 'documents:cash_transfer_edit' obj.pk %}" class="ws-link">Изменить</a>
<span class="ws-text-muted"> · </span>
<a href="{% url 'documents:cash_transfer_delete' obj.pk %}" class="ws-link ws-link-danger">Удалить</a>
</td>
</tr>
{% empty %}
<tr><td colspan="6" class="ws-empty">Нет перемещений.</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
{% endblock %}

18
app/templates/documents/confirm_delete.html
View File

@@ -1,11 +1,15 @@
{% extends "base.html" %}
{% block title %}Удалить — ERP WaterSurf{% endblock %}
{% block content %}
<h2>Удалить запись?</h2>
<p>{{ object }}</p>
<form method="post">
{% csrf_token %}
<button type="submit" class="btn btn-danger">Удалить</button>
<a href="{{ request.META.HTTP_REFERER|default:'/' }}" class="btn btn-secondary">Отмена</a>
</form>
<div class="ws-card">
<h2 class="ws-page-title">Удалить запись?</h2>
<p class="ws-confirm-text">{{ object }}</p>
<form method="post">
{% csrf_token %}
<div class="ws-btn-group">
<button type="submit" class="btn btn-ws-danger">Удалить</button>
<a href="{{ request.META.HTTP_REFERER|default:'/' }}" class="btn btn-ws-secondary">Отмена</a>
</div>
</form>
</div>
{% endblock %}

73
app/templates/documents/customer_order_list.html
View File

@@ -1,37 +1,44 @@
{% extends "base.html" %}
{% block title %}Заказы клиентов — ERP WaterSurf{% endblock %}
{% block content %}
<h2>Заказы клиентов</h2>
<p><a href="{% url 'documents:customer_order_create' %}" class="btn btn-primary">Создать заказ</a></p>
<table class="table table-striped">
<thead>
<tr>
<th>Дата</th>
<th>Номер</th>
<th>Вид заказа</th>
<th>Организация</th>
<th>Клиент</th>
<th>Стоимость заказа</th>
<th></th>
</tr>
</thead>
<tbody>
{% for obj in object_list %}
<tr>
<td>{{ obj.date }}</td>
<td>{{ obj.number }}</td>
<td>{{ obj.order_kind }}</td>
<td>{{ obj.organization }}</td>
<td>{{ obj.client }}</td>
<td>{{ obj.total_amount }}</td>
<td>
<a href="{% url 'documents:customer_order_edit' obj.pk %}">Изменить</a>
| <a href="{% url 'documents:customer_order_delete' obj.pk %}" class="text-danger">Удалить</a>
</td>
</tr>
{% empty %}
<tr><td colspan="7">Нет заказов.</td></tr>
{% endfor %}
</tbody>
</table>
<div class="ws-card">
<div class="ws-card-header">
<h2 class="ws-page-title mb-0">Заказы клиентов</h2>
<a href="{% url 'documents:customer_order_create' %}" class="btn btn-ws-primary">Создать заказ</a>
</div>
<div class="ws-table-wrap">
<table class="ws-table">
<thead>
<tr>
<th>Дата</th>
<th>Номер</th>
<th>Вид заказа</th>
<th>Организация</th>
<th>Клиент</th>
<th class="ws-num">Стоимость заказа</th>
<th></th>
</tr>
</thead>
<tbody>
{% for obj in object_list %}
<tr>
<td>{{ obj.date }}</td>
<td>{{ obj.number }}</td>
<td>{{ obj.order_kind }}</td>
<td>{{ obj.organization }}</td>
<td>{{ obj.client }}</td>
<td class="ws-num">{{ obj.total_amount }}</td>
<td class="ws-actions">
<a href="{% url 'documents:customer_order_edit' obj.pk %}" class="ws-link">Изменить</a>
<span class="ws-text-muted"> · </span>
<a href="{% url 'documents:customer_order_delete' obj.pk %}" class="ws-link ws-link-danger">Удалить</a>
</td>
</tr>
{% empty %}
<tr><td colspan="7" class="ws-empty">Нет заказов.</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
{% endblock %}

82
app/templates/documents/order_form.html
View File

@@ -1,42 +1,56 @@
{% extends "base.html" %}
{% block title %}{{ title }} — ERP WaterSurf{% endblock %}
{% block content %}
<h2>{% if object %}Редактировать{% else %}Создать{% endif %} {{ title }}</h2>
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<h3>Товары</h3>
{{ formset.management_form }}
<table class="table" id="order-items">
<thead>
<tr>
<th>Товар</th>
<th>Цена</th>
<th>Валюта</th>
<th>Количество</th>
<th>Стоимость</th>
<th>Удалить</th>
</tr>
</thead>
<tbody>
{% for f in formset %}
<tr class="item-row">
<td>{{ f.id }}{{ f.product }}</td>
<td>{{ f.price }}</td>
<td>{{ f.currency }}</td>
<td>{{ f.quantity }}</td>
<td class="row-amount">—</td>
<td>{% if f.DELETE %}{{ f.DELETE }}{% endif %}</td>
</tr>
{% endfor %}
</tbody>
</table>
<button type="submit" class="btn btn-primary">Сохранить</button>
<a href="{% url 'documents:customer_order_list' %}" class="btn btn-secondary">Отмена</a>
</form>
<div class="ws-card">
<h2 class="ws-page-title">{% if object %}Редактировать{% else %}Создать{% endif %} {{ title }}</h2>
<form method="post" class="ws-form-card">
{% csrf_token %}
{% for field in form %}
<div class="ws-form-group">
<label for="{{ field.id_for_label }}">{{ field.label }}</label>
{{ field }}
{% if field.errors %}<small class="ws-text-danger">{{ field.errors.0 }}</small>{% endif %}
</div>
{% endfor %}
<div class="ws-form-section">
<h3 class="ws-form-section-title">Товары</h3>
{{ formset.management_form }}
<div class="ws-table-wrap">
<table class="ws-table" id="order-items">
<thead>
<tr>
<th>Товар</th>
<th>Цена</th>
<th>Валюта</th>
<th>Количество</th>
<th class="ws-num">Стоимость</th>
<th>Удалить</th>
</tr>
</thead>
<tbody>
{% for f in formset %}
<tr class="item-row">
<td>{{ f.id }}{{ f.product }}</td>
<td>{{ f.price }}</td>
<td>{{ f.currency }}</td>
<td>{{ f.quantity }}</td>
<td class="row-amount ws-num">—</td>
<td>{% if f.DELETE %}{{ f.DELETE }}{% endif %}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
<div class="ws-btn-group" style="margin-top: 1.25rem;">
<button type="submit" class="btn btn-ws-primary">Сохранить</button>
<a href="{% url 'documents:customer_order_list' %}" class="btn btn-ws-secondary">Отмена</a>
</div>
</form>
</div>
{% block extra_js %}
<script>
document.querySelector('form').addEventListener('input', function() {
document.querySelector('.ws-form-card').addEventListener('input', function() {
document.querySelectorAll('#order-items .item-row').forEach(function(row) {
var price = parseFloat(row.querySelector('input[name$="-price"]')?.value) || 0;
var qty = parseFloat(row.querySelector('input[name$="-quantity"]')?.value) || 0;

86
app/templates/documents/supplier_order_form.html
View File

@@ -1,44 +1,58 @@
{% extends "base.html" %}
{% block title %}{{ title }} — ERP WaterSurf{% endblock %}
{% block content %}
<h2>{% if object %}Редактировать{% else %}Создать{% endif %} {{ title }}</h2>
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<h3>Товары</h3>
{{ formset.management_form }}
<table class="table" id="supplier-order-items">
<thead>
<tr>
<th>Товар</th>
<th>Цена</th>
<th>Валюта</th>
<th>Количество</th>
<th>Стоимость</th>
<th>Удалить</th>
</tr>
</thead>
<tbody>
{% for f in formset %}
<tr class="item-row">
<td>{{ f.id }}{{ f.product }}</td>
<td>{{ f.price }}</td>
<td>{{ f.currency }}</td>
<td>{{ f.quantity }}</td>
<td class="row-amount">—</td>
<td>{% if f.DELETE %}{{ f.DELETE }}{% endif %}</td>
</tr>
{% endfor %}
</tbody>
</table>
<button type="submit" class="btn btn-primary">Сохранить</button>
<a href="{% url 'documents:supplier_order_list' %}" class="btn btn-secondary">Отмена</a>
</form>
<div class="ws-card">
<h2 class="ws-page-title">{% if object %}Редактировать{% else %}Создать{% endif %} {{ title }}</h2>
<form method="post" class="ws-form-card">
{% csrf_token %}
{% for field in form %}
<div class="ws-form-group">
<label for="{{ field.id_for_label }}">{{ field.label }}</label>
{{ field }}
{% if field.errors %}<small class="ws-text-danger">{{ field.errors.0 }}</small>{% endif %}
</div>
{% endfor %}
<div class="ws-form-section">
<h3 class="ws-form-section-title">Товары</h3>
{{ formset.management_form }}
<div class="ws-table-wrap">
<table class="ws-table" id="supplier-order-items">
<thead>
<tr>
<th>Товар</th>
<th>Цена</th>
<th>Валюта</th>
<th>Количество</th>
<th class="ws-num">Стоимость</th>
<th>Удалить</th>
</tr>
</thead>
<tbody>
{% for f in formset %}
<tr class="item-row">
<td>{{ f.id }}{{ f.product }}</td>
<td>{{ f.price }}</td>
<td>{{ f.currency }}</td>
<td>{{ f.quantity }}</td>
<td class="row-amount ws-num">—</td>
<td>{% if f.DELETE %}{{ f.DELETE }}{% endif %}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
<div class="ws-btn-group" style="margin-top: 1.25rem;">
<button type="submit" class="btn btn-ws-primary">Сохранить</button>
<a href="{% url 'documents:supplier_order_list' %}" class="btn btn-ws-secondary">Отмена</a>
</div>
</form>
</div>
<script>
document.querySelector('form').addEventListener('input', function() {
document.querySelector('.ws-form-card').addEventListener('input', function() {
document.querySelectorAll('#supplier-order-items .item-row').forEach(function(row) {
var price = parseFloat(row.querySelector('input[name$=\"-price\"]')?.value) || 0;
var qty = parseFloat(row.querySelector('input[name$=\"-quantity\"]')?.value) || 0;
var price = parseFloat(row.querySelector('input[name$="-price"]')?.value) || 0;
var qty = parseFloat(row.querySelector('input[name$="-quantity"]')?.value) || 0;
row.querySelector('.row-amount').textContent = (price * qty).toFixed(2);
});
});

73
app/templates/documents/supplier_order_list.html
View File

@@ -1,37 +1,44 @@
{% extends "base.html" %}
{% block title %}Заказы поставщику — ERP WaterSurf{% endblock %}
{% block content %}
<h2>Заказы поставщику</h2>
<p><a href="{% url 'documents:supplier_order_create' %}" class="btn btn-primary">Создать заказ</a></p>
<table class="table table-striped">
<thead>
<tr>
<th>Дата</th>
<th>Номер</th>
<th>Организация</th>
<th>Поставщик</th>
<th>Стоимость в валюте</th>
<th>Стоимость заказа</th>
<th></th>
</tr>
</thead>
<tbody>
{% for obj in object_list %}
<tr>
<td>{{ obj.date }}</td>
<td>{{ obj.number }}</td>
<td>{{ obj.organization }}</td>
<td>{{ obj.supplier }}</td>
<td>{{ obj.total_in_currency }}</td>
<td>{{ obj.total_amount }}</td>
<td>
<a href="{% url 'documents:supplier_order_edit' obj.pk %}">Изменить</a>
| <a href="{% url 'documents:supplier_order_delete' obj.pk %}" class="text-danger">Удалить</a>
</td>
</tr>
{% empty %}
<tr><td colspan="7">Нет заказов.</td></tr>
{% endfor %}
</tbody>
</table>
<div class="ws-card">
<div class="ws-card-header">
<h2 class="ws-page-title mb-0">Заказы поставщику</h2>
<a href="{% url 'documents:supplier_order_create' %}" class="btn btn-ws-primary">Создать заказ</a>
</div>
<div class="ws-table-wrap">
<table class="ws-table">
<thead>
<tr>
<th>Дата</th>
<th>Номер</th>
<th>Организация</th>
<th>Поставщик</th>
<th class="ws-num">Стоимость в валюте</th>
<th class="ws-num">Стоимость заказа</th>
<th></th>
</tr>
</thead>
<tbody>
{% for obj in object_list %}
<tr>
<td>{{ obj.date }}</td>
<td>{{ obj.number }}</td>
<td>{{ obj.organization }}</td>
<td>{{ obj.supplier }}</td>
<td class="ws-num">{{ obj.total_in_currency }}</td>
<td class="ws-num">{{ obj.total_amount }}</td>
<td class="ws-actions">
<a href="{% url 'documents:supplier_order_edit' obj.pk %}" class="ws-link">Изменить</a>
<span class="ws-text-muted"> · </span>
<a href="{% url 'documents:supplier_order_delete' obj.pk %}" class="ws-link ws-link-danger">Удалить</a>
</td>
</tr>
{% empty %}
<tr><td colspan="7" class="ws-empty">Нет заказов.</td></tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
{% endblock %}