Merge branch 'Feature/Chcekout/AddHasConflict' into Main

# Conflicts: # ServiceHost/Areas/Admin/Controllers/FinancialStatementController.cs
2025-08-06 14:11:06 +03:30
parent 2f9426bdaf a71433f751
commit 8432b2660e
16 changed files with 10770 additions and 435 deletions
--- a/CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs
+++ b/CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs
@@ -307,6 +307,9 @@ namespace CompanyManagment.EFCore.Migrations
                        .HasMaxLength(10)
                        .HasColumnType("nvarchar(10)");

+                    b.Property<bool>("HasAmountConflict")
+                        .HasColumnType("bit");
+
                    b.Property<bool>("HasRollCall")
                        .HasColumnType("bit");