From 829a1a98e3686abbc2e57b7928ca4384f9126ed3 Mon Sep 17 00:00:00 2001
From: LocoAgent <loco@labnethub.ru>
Date: Wed, 5 Aug 2026 14:51:35 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=D0=B0:=20=D0=B4=D0=BE=D0=BF.=20=D0=9E?=
 =?UTF-8?q?=D0=9A=D0=92=D0=AD=D0=94=20=D0=BD=D0=B0=D1=80=D0=B5=D0=B7=D0=B0?=
 =?UTF-8?q?=D1=8E=D1=82=D1=81=D1=8F=20=D0=BF=D0=BE=20=D0=BA=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BC=20=D0=B8=20=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B7=D1=83=D1=8E=D1=82=D1=81=D1=8F=20(=D0=BD=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D1=8E=D1=82?=
 =?UTF-8?q?=D1=81=D1=8F=20=C2=AB=D1=81=D1=8B=D1=80=D1=8B=D0=BC=D0=B8=C2=BB?=
 =?UTF-8?q?=20=D1=81=D0=BA=D0=BB=D0=B5=D0=B5=D0=BD=D0=BD=D1=8B=D0=BC=D0=B8?=
 =?UTF-8?q?=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D1=8F=D0=BC=D0=B8),=20=D1=83?=
 =?UTF-8?q?=D0=B3=D1=80=D0=BE=D0=B7=D1=8B/=D0=B8=D0=BD=D1=86=D0=B8=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=82=D1=8B=20=D1=81=20=D0=BF=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D0=BE=D0=BC=20=D0=B2=D0=BD=D1=83=D1=82=D1=80?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=81=D0=BA=D0=BB=D0=B5=D0=B8=D0=B2=D0=B0=D1=8E=D1=82=D1=81?=
 =?UTF-8?q?=D1=8F=20=D0=B2=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dokogen/ui.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/dokogen/ui.py b/dokogen/ui.py
index 23b3798..e86dc7d 100644
--- a/dokogen/ui.py
+++ b/dokogen/ui.py
@@ -1483,11 +1483,18 @@ class DokoGenApp:
         self.doc_number_var.set(c.contract_number or "")
         self.doc_date_var.set(c.contract_date or "")
 
-        # Дополнительные ОКВЭД
+        # Дополнительные ОКВЭД — нарезаем по кодам и нормализуем в «код название»
         if hasattr(self, 'okved_extra_listbox'):
             self.okved_extra_listbox.delete(0, tk.END)
-            for item in (c.okved_extra or []):
-                self.okved_extra_listbox.insert(tk.END, item)
+            try:
+                from .verify import split_okved_extra, resolve_okved
+                from .api_settings import load_api_settings as _las_g
+                _tok_g = (_las_g().get('dadata_token') or '')
+                for item in split_okved_extra(c.okved_extra or []):
+                    self.okved_extra_listbox.insert(tk.END, resolve_okved(item, _tok_g))
+            except Exception:
+                for item in (c.okved_extra or []):
+                    self.okved_extra_listbox.insert(tk.END, item)
 
         # Склонения
         idx_map = {'nomn': 1, 'gent': 2, 'datv': 3, 'accs': 4, 'ablt': 5, 'loct': 6}
@@ -1909,7 +1916,10 @@ class DokoGenApp:
                     w.set(val)
                 elif isinstance(w, tk.Listbox):
                     w.delete(0, tk.END)
-                    lines = [ln.strip() for ln in str(val).split('\n') if ln.strip()]
+                    val = str(val)
+                    if model_field in ('threats', 'incidents'):
+                        val = normalize_threats(val)
+                    lines = [ln.strip() for ln in val.split('\n') if ln.strip()]
                     if model_field == 'threats':
                         from .threat_rules import sort_threats_by_ubi
                         lines = sort_threats_by_ubi(lines)