diff --git a/api/app/static/js/shared.js b/api/app/static/js/shared.js
index e65890e..38ddd1b 100644
--- a/api/app/static/js/shared.js
+++ b/api/app/static/js/shared.js
@@ -888,8 +888,8 @@ function _renderHeaderInfo(order) {
         }
     }
 
-    // ROA column
-    if (isPJ && pi.denumire_roa) {
+    // ROA column — show partner name for both PJ and PF
+    if (pi && pi.denumire_roa) {
         const partenerRoa = document.getElementById('detailPartenerRoa');
         if (partenerRoa) {
             partenerRoa.textContent = pi.denumire_roa;
diff --git a/api/app/templates/base.html b/api/app/templates/base.html
index 50590d5..cae4a68 100644
--- a/api/app/templates/base.html
+++ b/api/app/templates/base.html
@@ -161,7 +161,7 @@
 
     <script>window.ROOT_PATH = "{{ rp }}";</script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="{{ rp }}/static/js/shared.js?v=24"></script>
+    <script src="{{ rp }}/static/js/shared.js?v=25"></script>
     <script>
     // Dark mode toggle
     function toggleDarkMode() {
diff --git a/api/database-scripts/05_pack_import_parteneri.pck b/api/database-scripts/05_pack_import_parteneri.pck
index ddcd419..7e7b233 100644
--- a/api/database-scripts/05_pack_import_parteneri.pck
+++ b/api/database-scripts/05_pack_import_parteneri.pck
@@ -4,6 +4,7 @@ CREATE OR REPLACE PACKAGE PACK_IMPORT_PARTENERI AS
   -- 31.03.2026 - parser inteligent adrese: split numar in bloc/scara/apart/etaj (fix ORA-12899 pe NUMAR max 10 chars)
   -- 01.04.2026 - ANAF dedup: cautare duala CUI, adrese pe strada+diacritics, strip diacritics la stocare
   -- 02.04.2026 - cautare CUI strict (p_strict_search=1) sau dual anti-dedup (NULL)
+  -- 02.04.2026 - parser adrese: extrage APARTAMENT/SCARA/ETAJ embedded in strada (fix "Nr17 apartament 8")
 
   -- ====================================================================
   -- CONSTANTS
@@ -533,6 +534,38 @@ CREATE OR REPLACE PACKAGE BODY PACK_IMPORT_PARTENERI AS
         p_bloc   := TRIM(REGEXP_REPLACE(v_token_upper, '.*(\s)(BLOC|BL\.?)\s*(\S+).*', '\3', 1, 1));
         p_strada := TRIM(REGEXP_REPLACE(p_strada, '(\s)(BLOC|BL\.?)\s*\S+', '', 1, 1, 'i'));
       END IF;
+      -- Re-read v_token_upper after BLOC removal may have changed p_strada
+      v_token_upper := UPPER(p_strada);
+      -- Extrage APARTAMENT din strada (ex: "George Enescu apartament 8")
+      -- Separator [\s.:] obligatoriu dupa prefix scurt (AP) pt a evita false-positives (ex: "APATEULUI")
+      IF REGEXP_LIKE(v_token_upper, '(\s)(APARTAMENT|APART\.?|AP\.?)[\s.:]+(\S+)') THEN
+        p_apart  := TRIM(REGEXP_REPLACE(v_token_upper, '.*(\s)(APARTAMENT|APART\.?|AP\.?)[\s.:]+(\S+).*', '\3', 1, 1));
+        p_strada := TRIM(REGEXP_REPLACE(p_strada, '(\s)(APARTAMENT|APART\.?|AP\.?)[\s.:]+\S+', '', 1, 1, 'i'));
+      -- Fallback: "apart14" sau "ap14" — keyword lipit direct de cifra (sigur, nu exista cuvinte AP+cifra)
+      ELSIF REGEXP_LIKE(v_token_upper, '(\s)(APART|AP)(\d\S*)') THEN
+        p_apart  := TRIM(REGEXP_REPLACE(v_token_upper, '.*(\s)(APART|AP)(\d\S*).*', '\3', 1, 1));
+        p_strada := TRIM(REGEXP_REPLACE(p_strada, '(\s)(APART|AP)\d\S*', '', 1, 1, 'i'));
+      END IF;
+      v_token_upper := UPPER(p_strada);
+      -- Extrage SCARA din strada (ex: "Str Dacia Nr5 scara B")
+      IF REGEXP_LIKE(v_token_upper, '(\s)(SCARA|SC\.?)[\s.:]+(\S+)') THEN
+        p_scara  := TRIM(REGEXP_REPLACE(v_token_upper, '.*(\s)(SCARA|SC\.?)[\s.:]+(\S+).*', '\3', 1, 1));
+        p_strada := TRIM(REGEXP_REPLACE(p_strada, '(\s)(SCARA|SC\.?)[\s.:]+\S+', '', 1, 1, 'i'));
+      -- Fallback: "scara3" sau "sc1" — keyword lipit direct de cifra
+      ELSIF REGEXP_LIKE(v_token_upper, '(\s)(SCARA|SC)(\d\S*)') THEN
+        p_scara  := TRIM(REGEXP_REPLACE(v_token_upper, '.*(\s)(SCARA|SC)(\d\S*).*', '\3', 1, 1));
+        p_strada := TRIM(REGEXP_REPLACE(p_strada, '(\s)(SCARA|SC)\d\S*', '', 1, 1, 'i'));
+      END IF;
+      v_token_upper := UPPER(p_strada);
+      -- Extrage ETAJ din strada (ex: "Str Dacia Nr5 etaj 2")
+      IF REGEXP_LIKE(v_token_upper, '(\s)(ETAJ|ET\.?)[\s.:]+(\S+)') THEN
+        p_etaj   := TRIM(REGEXP_REPLACE(v_token_upper, '.*(\s)(ETAJ|ET\.?)[\s.:]+(\S+).*', '\3', 1, 1));
+        p_strada := TRIM(REGEXP_REPLACE(p_strada, '(\s)(ETAJ|ET\.?)[\s.:]+\S+', '', 1, 1, 'i'));
+      -- Fallback: "etaj2" sau "et2" — keyword lipit direct de cifra
+      ELSIF REGEXP_LIKE(v_token_upper, '(\s)(ETAJ|ET)(\d\S*)') THEN
+        p_etaj   := TRIM(REGEXP_REPLACE(v_token_upper, '.*(\s)(ETAJ|ET)(\d\S*).*', '\3', 1, 1));
+        p_strada := TRIM(REGEXP_REPLACE(p_strada, '(\s)(ETAJ|ET)\d\S*', '', 1, 1, 'i'));
+      END IF;
     END IF;
 
     -- ================================================================