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 8 additions and 8 deletions
Showing only changes of commit 61e178544b - Show all commits

View File

@@ -883,17 +883,17 @@ class TestCompanyDatasetService:
)
current_tax = profit_before_tax * 19 // 100
deferred_tax = profit_before_tax // 100
income_tax = current_tax + deferred_tax
other_tax_effects = amount(25, 1, 2)
net_profit = profit_before_tax - income_tax - other_tax_effects
income_tax = -current_tax + deferred_tax
other_tax_effects = -amount(25, 1, 2)
net_profit = profit_before_tax + income_tax + other_tax_effects
revaluation_result = amount(90, 3, 7)
other_operations_result = amount(55, 2, 5)
other_operations_tax = amount(18, 1, 1)
other_operations_tax = -amount(18, 1, 1)
comprehensive_result = (
net_profit
+ revaluation_result
+ other_operations_result
- other_operations_tax
+ other_operations_tax
)
basic_eps = max(1, net_profit // 1_000)
diluted_eps = max(1, basic_eps - 1)

View File

@@ -400,18 +400,18 @@ class TestCompaniesCommandsTest(TestCase):
)
self.assertEqual(
values[("2", "2410")],
values[("2", "2411")] + values[("2", "2412")],
-values[("2", "2411")] + values[("2", "2412")],
)
self.assertEqual(
values[("2", "2400")],
values[("2", "2300")] - values[("2", "2410")] - values[("2", "2460")],
values[("2", "2300")] + values[("2", "2410")] + values[("2", "2460")],
)
self.assertEqual(
values[("2", "2500")],
values[("2", "2400")]
+ values[("2", "2510")]
+ values[("2", "2520")]
- values[("2", "2530")],
+ values[("2", "2530")],
)
for previous_year, current_year in zip(