From 7355d27b9162f1de49b0999f80957ac670f22ecb Mon Sep 17 00:00:00 2001
From: cursor-agent <agent@gen7x.local>
Date: Thu, 26 Feb 2026 11:59:57 +0000
Subject: [PATCH] =?UTF-8?q?Feature:=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B0=D0=BA?=
 =?UTF-8?q?=D1=82=D0=BD=D1=8B=D0=B5=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F,=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F,=20=D1=80=D0=B0=D1=81=D1=85=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B0=20=D0=B4=D0=B5=D0=BD=D0=B5=D0=B6=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D1=81=D1=80=D0=B5=D0=B4=D1=81=D1=82=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Made-with: Cursor
---
 HISTORY.md                                 | 10 ++++++++
 app/documents/forms.py                     | 12 +++++++++
 app/templates/documents/cash_doc_form.html | 30 +++++++++++++++++-----
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index fb60340..5e6f75e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,15 @@
 # История изменений ERP WaterSurf
 
+## 2025-02-25 22:00 UTC – Компактные формы денежных документов (поступление, перемещение, расход)
+
+**Проблема**: Формы поступления, перемещения и расхода денежных средств выводили все поля списком с подписями сверху.
+
+**Решение**: Общий шаблон cash_doc_form.html переведён на компактную раскладку по образцу заказов: первая строка — Дата и Номер (подпись слева от поля, 10 и 15 символов), остальные поля — парами в одну строку в две колонки (подпись слева). Добавлены виджеты даты/номера в CashInflowForm, CashTransferForm, CashExpenseForm.
+
+**Изменения**: documents/forms.py (виджеты date/number в трёх формах), documents/cash_doc_form.html (компактная разметка с ws-form-compact).
+
+---
+
 ## 2025-02-25 21:45 UTC – Подписи полей слева от полей в одну строку
 
 **Проблема**: Подписи полей в формах заказов были расположены над полями ввода.
diff --git a/app/documents/forms.py b/app/documents/forms.py
index ae719b8..98b47e1 100644
--- a/app/documents/forms.py
+++ b/app/documents/forms.py
@@ -73,15 +73,27 @@ class CashInflowForm(forms.ModelForm):
     class Meta:
         model = CashInflow
         fields = ("date", "number", "recipient", "amount", "customer_order", "comment", "author")
+        widgets = {
+            "date": forms.DateInput(attrs={"size": 10}),
+            "number": forms.TextInput(attrs={"size": 15, "maxlength": 15}),
+        }
 
 
 class CashTransferForm(forms.ModelForm):
     class Meta:
         model = CashTransfer
         fields = ("date", "number", "sender", "recipient", "amount", "comment", "author")
+        widgets = {
+            "date": forms.DateInput(attrs={"size": 10}),
+            "number": forms.TextInput(attrs={"size": 15, "maxlength": 15}),
+        }
 
 
 class CashExpenseForm(forms.ModelForm):
     class Meta:
         model = CashExpense
         fields = ("date", "number", "sender", "amount", "supplier_order", "comment", "author")
+        widgets = {
+            "date": forms.DateInput(attrs={"size": 10}),
+            "number": forms.TextInput(attrs={"size": 15, "maxlength": 15}),
+        }
diff --git a/app/templates/documents/cash_doc_form.html b/app/templates/documents/cash_doc_form.html
index 9c01409..67a9e8d 100644
--- a/app/templates/documents/cash_doc_form.html
+++ b/app/templates/documents/cash_doc_form.html
@@ -3,15 +3,31 @@
 {% block content %}
 <div class="ws-card">
   <h2 class="ws-page-title">{% if object %}Редактировать{% else %}Создать{% endif %} {{ title }}</h2>
-  <form method="post" class="ws-form-card">
+  <form method="post" class="ws-form-card ws-form-compact">
     {% 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 class="ws-form-row ws-form-row-date-number">
+      <div class="ws-form-group ws-field-date">
+        <label for="{{ form.date.id_for_label }}">{{ form.date.label }}</label>
+        {{ form.date }}
+        {% if form.date.errors %}<small class="ws-text-danger">{{ form.date.errors.0 }}</small>{% endif %}
+      </div>
+      <div class="ws-form-group ws-field-number">
+        <label for="{{ form.number.id_for_label }}">{{ form.number.label }}</label>
+        {{ form.number }}
+        {% if form.number.errors %}<small class="ws-text-danger">{{ form.number.errors.0 }}</small>{% endif %}
+      </div>
+    </div>
+    <div class="ws-form-row ws-form-row-2">
+      {% for field in form %}
+        {% if field.name != 'date' and field.name != 'number' %}
+          <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>
+        {% endif %}
+      {% endfor %}
     </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>