Merge dev into main for customer release #39

Merged
avm merged 21 commits from feature/customer-release-20260811 into main 2026-08-11 13:30:24 +03:00
2 changed files with 10 additions and 10 deletions
Showing only changes of commit 4da56f3823 - Show all commits

View File

@@ -81,11 +81,9 @@ def _build_fns_excel_bytes() -> bytes:
wb = Workbook() wb = Workbook()
ws = wb.active ws = wb.active
year = fake.random_int(min=2020, max=2025) year = fake.random_int(min=2020, max=2025)
ws.append(["Form", None, year, None]) ws.append(["Форма №1", None, year, None])
ws.append([None, "Code", "Start", "End"]) ws.append([None, "Код", "Начало", "Конец"])
ws.append( ws.append(["Баланс", "1600", fake.random_int(10, 999), fake.random_int(10, 999)])
[fake.word(), _digits(4), fake.random_int(10, 999), fake.random_int(10, 999)]
)
buf = io.BytesIO() buf = io.BytesIO()
wb.save(buf) wb.save(buf)
wb.close() wb.close()

View File

@@ -3,7 +3,7 @@
from __future__ import annotations from __future__ import annotations
import io import io
from datetime import date, timedelta from datetime import timedelta
from pathlib import Path from pathlib import Path
from tempfile import TemporaryDirectory from tempfile import TemporaryDirectory
from types import SimpleNamespace from types import SimpleNamespace
@@ -45,10 +45,10 @@ def _build_fns_excel_bytes() -> bytes:
workbook = Workbook() workbook = Workbook()
worksheet = workbook.active worksheet = workbook.active
year = fake.random_int(min=2020, max=2025) year = fake.random_int(min=2020, max=2025)
worksheet.append(["Form", None, year, None]) worksheet.append(["Форма №1", None, year, None])
worksheet.append([None, "Code", "Start", "End"]) worksheet.append([None, "Код", "Начало", "Конец"])
worksheet.append( worksheet.append(
[fake.word(), _digits(4), fake.random_int(10, 999), fake.random_int(10, 999)] ["Баланс", "1600", fake.random_int(10, 999), fake.random_int(10, 999)]
) )
buffer = io.BytesIO() buffer = io.BytesIO()
workbook.save(buffer) workbook.save(buffer)
@@ -634,7 +634,9 @@ class ExchangeApiInventoryE2ETest(AuthenticatedApiMixin, APITestCase):
) )
self.assertEqual(copy_response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) self.assertEqual(copy_response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
self.assertEqual(tables_response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) self.assertEqual(
tables_response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED
)
self.assertEqual( self.assertEqual(
detail_periodic.status_code, detail_periodic.status_code,
status.HTTP_405_METHOD_NOT_ALLOWED, status.HTTP_405_METHOD_NOT_ALLOWED,