Feature: общая сумма заказа и автор только для отображения в формах заказов

Made-with: Cursor
This commit is contained in:
2026-02-26 16:17:24 +00:00
parent 824d5512c7
commit a183121721
6 changed files with 61 additions and 11 deletions

View File

@@ -82,7 +82,7 @@ SupplierOrderItemFormSetUpdate = inlineformset_factory(
class CustomerOrderForm(forms.ModelForm):
class Meta:
model = CustomerOrder
fields = ("date", "number", "order_kind", "organization", "client", "author")
fields = ("date", "number", "order_kind", "organization", "client")
widgets = {
"date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
"number": forms.TextInput(attrs={"size": 15, "maxlength": 15}),
@@ -92,7 +92,7 @@ class CustomerOrderForm(forms.ModelForm):
class SupplierOrderForm(forms.ModelForm):
class Meta:
model = SupplierOrder
fields = ("date", "number", "organization", "supplier", "customer_order", "currency", "rate", "author")
fields = ("date", "number", "organization", "supplier", "customer_order", "currency", "rate")
widgets = {
"date": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d"),
"number": forms.TextInput(attrs={"size": 15, "maxlength": 15}),

View File

@@ -32,9 +32,11 @@ logger = logging.getLogger(__name__)
def set_author(form, request):
"""Подставить автора из профиля пользователя."""
"""Подставить автора из профиля пользователя при создании документа."""
if form.instance.pk:
return # при редактировании автора не меняем
author = get_author_employee(request.user)
if author and "author" in form.fields:
if author:
form.instance.author = author
@@ -54,6 +56,7 @@ class CustomerOrderCreate(LoginRequiredMixin, CreateView):
ctx = super().get_context_data(**kwargs)
ctx["formset"] = CustomerOrderItemFormSet(instance=self.object) if self.object and self.object.pk else CustomerOrderItemFormSet()
ctx["title"] = "Заказ клиента"
ctx["author_display"] = get_author_employee(self.request.user) if not self.object or not self.object.pk else self.object.author
return ctx
def form_valid(self, form):
@@ -85,6 +88,7 @@ class CustomerOrderUpdate(LoginRequiredMixin, UpdateView):
ctx = super().get_context_data(**kwargs)
ctx["formset"] = CustomerOrderItemFormSetUpdate(instance=self.object)
ctx["title"] = "Заказ клиента"
ctx["author_display"] = self.object.author
return ctx
def form_valid(self, form):
@@ -134,6 +138,7 @@ class SupplierOrderCreate(LoginRequiredMixin, CreateView):
ctx = super().get_context_data(**kwargs)
ctx["formset"] = SupplierOrderItemFormSet(instance=self.object) if self.object and self.object.pk else SupplierOrderItemFormSet()
ctx["title"] = "Заказ поставщику"
ctx["author_display"] = get_author_employee(self.request.user) if not self.object or not self.object.pk else self.object.author
return ctx
def form_valid(self, form):
@@ -165,6 +170,7 @@ class SupplierOrderUpdate(LoginRequiredMixin, UpdateView):
ctx = super().get_context_data(**kwargs)
ctx["formset"] = SupplierOrderItemFormSetUpdate(instance=self.object)
ctx["title"] = "Заказ поставщику"
ctx["author_display"] = self.object.author
return ctx
def form_valid(self, form):