@sapui5/sap.suite.ui.generic.template 1.148.1 → 1.149.0

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_ko.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=\uB4DC\uB798\uD504\uD2B8
 
 SAVE=\uC800\uC7A5
 
+SAVE_AND_BACK=\uC800\uC7A5 \uD6C4 \uB3CC\uC544\uAC00\uAE30
+
 SAVE_AND_EDIT=\uC800\uC7A5 \uD6C4 \uD3B8\uC9D1
 
 SAVE_AND_NEXT=\uC800\uC7A5 \uD6C4 \uB2E4\uC74C
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=\uC720\uD6A8\uC131 \uD655\uC778
 
 CREATE=\uC0DD\uC131
 
+CREATE_AND_BACK=\uC0DD\uC131 \uD6C4 \uB3CC\uC544\uAC00\uAE30
+
 CLOSE=\uB2EB\uAE30
 
 OK=\uD655\uC778

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_lt.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Juodra\u0161tis
 
 SAVE=\u012Era\u0161yti
 
+SAVE_AND_BACK=\u012Era\u0161yti ir gr\u012F\u017Eti
+
 SAVE_AND_EDIT=\u012Era\u0161yti ir redaguoti
 
 SAVE_AND_NEXT=\u012Era\u0161yti ir pereiti
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Tikrinti
 
 CREATE=Kurti
 
+CREATE_AND_BACK=Sukurti ir gr\u012F\u017Eti
+
 CLOSE=U\u017Edaryti
 
 OK=Gerai

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_lv.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Melnraksts
 
 SAVE=Saglab\u0101t
 
+SAVE_AND_BACK=Saglab\u0101t un atgriezties
+
 SAVE_AND_EDIT=Saglab\u0101t un redi\u0123\u0113t
 
 SAVE_AND_NEXT=Saglab\u0101t un t\u0101l\u0101k
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=P\u0101rbaud\u012Bt
 
 CREATE=Izveidot
 
+CREATE_AND_BACK=Izveidot un atgriezties
+
 CLOSE=Aizv\u0113rt
 
 OK=Labi

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_mk.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=\u041D\u0430\u0446\u0440\u0442
 
 SAVE=\u0417\u0430\u0447\u0443\u0432\u0430\u0458
 
+SAVE_AND_BACK=\u0417\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0432\u0440\u0430\u0442\u0438 \u0441\u0435
+
 SAVE_AND_EDIT=\u0417\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0443\u0440\u0435\u0434\u0438
 
 SAVE_AND_NEXT=\u0417\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u043E\u0434\u0438 \u0441\u043B\u0435\u0434\u043D\u043E
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=\u041F\u043E\u0442\u0432\u0440\u0434\u0438
 
 CREATE=\u0421\u043E\u0437\u0434\u0430\u0458
 
+CREATE_AND_BACK=\u0421\u043E\u0437\u0434\u0430\u0458 \u0438 \u0432\u0440\u0430\u0442\u0438 \u0441\u0435
+
 CLOSE=\u0417\u0430\u0442\u0432\u043E\u0440\u0438
 
 OK=\u0412\u043E \u0440\u0435\u0434

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_ms.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Draf
 
 SAVE=Simpan
 
+SAVE_AND_BACK=Simpan dan Kembali
+
 SAVE_AND_EDIT=Simpan dan Edit
 
 SAVE_AND_NEXT=Simpan dan Seterusnya
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Sahkan
 
 CREATE=Cipta
 
+CREATE_AND_BACK=Cipta dan Kembali
+
 CLOSE=Tutup
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_nl.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Concept
 
 SAVE=Opslaan
 
+SAVE_AND_BACK=Opslaan en terug
+
 SAVE_AND_EDIT=Opslaan en bewerken
 
 SAVE_AND_NEXT=Opslaan en volgende
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Valideren
 
 CREATE=Cre\u00EBren
 
+CREATE_AND_BACK=Cre\u00EBren en terug
+
 CLOSE=Sluiten
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_no.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Utkast
 
 SAVE=Lagre
 
+SAVE_AND_BACK=Lagre og g\u00E5 tilbake
+
 SAVE_AND_EDIT=Lagre og rediger
 
 SAVE_AND_NEXT=Lagre og neste
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Valider
 
 CREATE=Opprett
 
+CREATE_AND_BACK=Opprett og g\u00E5 tilbake
+
 CLOSE=Lukk
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_pl.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Wersja robocza
 
 SAVE=Zapisz
 
+SAVE_AND_BACK=Zapisz i wr\u00F3\u0107
+
 SAVE_AND_EDIT=Zapisz i edytuj
 
 SAVE_AND_NEXT=Zapisz i dalej
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Waliduj
 
 CREATE=Utw\u00F3rz
 
+CREATE_AND_BACK=Utw\u00F3rz i wr\u00F3\u0107
+
 CLOSE=Zamknij
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_pt.properties

@@ -17,7 +17,9 @@ DRAFT_VERSION=Esbo\u00E7o
 
 SAVE=Salvar
 
-SAVE_AND_EDIT=Salvar e editar
+SAVE_AND_BACK=Gravar e voltar
+
+SAVE_AND_EDIT=Gravar e editar
 
 SAVE_AND_NEXT=Gravar e seguinte
 
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Validar
 
 CREATE=Criar
 
+CREATE_AND_BACK=Criar e voltar
+
 CLOSE=Fechar
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_pt_PT.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Rascunho
 
 SAVE=Guardar
 
+SAVE_AND_BACK=Guardar e voltar
+
 SAVE_AND_EDIT=Guardar e editar
 
 SAVE_AND_NEXT=Guardar e pr\u00F3ximo
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Validar
 
 CREATE=Criar
 
+CREATE_AND_BACK=Criar e voltar
+
 CLOSE=Fechar
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_ro.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Versiune preliminar\u0103
 
 SAVE=Salvare
 
+SAVE_AND_BACK=Salvare \u0219i \u00EEnapoi
+
 SAVE_AND_EDIT=Salvare \u0219i editare
 
 SAVE_AND_NEXT=Salvare \u0219i urm\u0103tor
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Validare
 
 CREATE=Creare
 
+CREATE_AND_BACK=Creare \u0219i \u00EEnapoi
+
 CLOSE=\u00CEnchidere
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_ru.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=\u0427\u0435\u0440\u043D\u043E\u0432\u0438\u043A
 
 SAVE=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
 
+SAVE_AND_BACK=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0438 \u043D\u0430\u0437\u0430\u0434
+
 SAVE_AND_EDIT=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0438 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
 
 SAVE_AND_NEXT=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0438 \u0434\u0430\u043B\u0435\u0435
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=\u041F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C
 
 CREATE=\u0421\u043E\u0437\u0434\u0430\u0442\u044C
 
+CREATE_AND_BACK=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0438 \u043D\u0430\u0437\u0430\u0434
+
 CLOSE=\u0417\u0430\u043A\u0440\u044B\u0442\u044C
 
 OK=\u041E\u041A

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_sh.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Nacrt
 
 SAVE=Sa\u010Duvaj
 
+SAVE_AND_BACK=Sa\u010Duvaj i vrati se
+
 SAVE_AND_EDIT=Sa\u010Duvaj i uredi
 
 SAVE_AND_NEXT=Sa\u010Duvaj i idi na slede\u0107e
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Validiraj
 
 CREATE=Kreiraj
 
+CREATE_AND_BACK=Kreiraj i vrati se
+
 CLOSE=Zatvori
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_sk.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=N\u00E1vrh
 
 SAVE=Ulo\u017Ei\u0165
 
+SAVE_AND_BACK=Ulo\u017Ei\u0165 a sp\u00E4\u0165
+
 SAVE_AND_EDIT=Ulo\u017Ei\u0165 a spracova\u0165
 
 SAVE_AND_NEXT=Ulo\u017Ei\u0165 a \u010Falej
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Overi\u0165
 
 CREATE=Vytvori\u0165
 
+CREATE_AND_BACK=Vytvori\u0165 a sp\u00E4\u0165
+
 CLOSE=Zavrie\u0165
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_sl.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Osnutek
 
 SAVE=Shrani
 
+SAVE_AND_BACK=Shrani in pojdi nazaj
+
 SAVE_AND_EDIT=Shrani in uredi
 
 SAVE_AND_NEXT=Shrani in naprej
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Validacija
 
 CREATE=Kreiraj
 
+CREATE_AND_BACK=Ustvari in pojdi nazaj
+
 CLOSE=Zapiranje
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_sr.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=\u041D\u0430\u0446\u0440\u0442
 
 SAVE=\u0421\u0430\u0447\u0443\u0432\u0430\u0458
 
+SAVE_AND_BACK=\u0421\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0432\u0440\u0430\u0442\u0438 \u0441\u0435
+
 SAVE_AND_EDIT=\u0421\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0443\u0440\u0435\u0434\u0438
 
 SAVE_AND_NEXT=\u0421\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0438\u0434\u0438 \u043D\u0430 \u0441\u043B\u0435\u0434\u0435\u045B\u0435
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=\u0412\u0430\u043B\u0438\u0434\u0438\u0440\u0430\u0458
 
 CREATE=\u041A\u0440\u0435\u0438\u0440\u0430\u0458
 
+CREATE_AND_BACK=\u041A\u0440\u0435\u0438\u0440\u0430\u0458 \u0438 \u0432\u0440\u0430\u0442\u0438 \u0441\u0435
+
 CLOSE=\u0417\u0430\u0442\u0432\u043E\u0440\u0438
 
 OK=\u041E\u041A

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_sv.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Utkast
 
 SAVE=Spara
 
+SAVE_AND_BACK=Spara och tillbaka
+
 SAVE_AND_EDIT=Spara och bearbeta
 
 SAVE_AND_NEXT=Spara och forts\u00E4tt
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Validera
 
 CREATE=Skapa
 
+CREATE_AND_BACK=Skapa och tillbaka
+
 CLOSE=St\u00E4ng
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_th.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=\u0E41\u0E1A\u0E1A\u0E23\u0E48\u0E32\u0E07
 
 SAVE=\u0E40\u0E01\u0E47\u0E1A\u0E1A\u0E31\u0E19\u0E17\u0E36\u0E01
 
+SAVE_AND_BACK=\u0E40\u0E01\u0E47\u0E1A\u0E1A\u0E31\u0E19\u0E17\u0E36\u0E01\u0E41\u0E25\u0E30\u0E22\u0E49\u0E2D\u0E19\u0E01\u0E25\u0E31\u0E1A
+
 SAVE_AND_EDIT=\u0E40\u0E01\u0E47\u0E1A\u0E1A\u0E31\u0E19\u0E17\u0E36\u0E01\u0E41\u0E25\u0E30\u0E41\u0E01\u0E49\u0E44\u0E02
 
 SAVE_AND_NEXT=\u0E40\u0E01\u0E47\u0E1A\u0E1A\u0E31\u0E19\u0E17\u0E36\u0E01\u0E41\u0E25\u0E30\u0E14\u0E33\u0E40\u0E19\u0E34\u0E19\u0E01\u0E32\u0E23\u0E16\u0E31\u0E14\u0E44\u0E1B
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=\u0E15\u0E23\u0E27\u0E08\u0E2A\u0E2D\u0E1A\u0E04\u0E27\u0E32\u0E2
 
 CREATE=\u0E2A\u0E23\u0E49\u0E32\u0E07
 
+CREATE_AND_BACK=\u0E2A\u0E23\u0E49\u0E32\u0E07\u0E41\u0E25\u0E30\u0E22\u0E49\u0E2D\u0E19\u0E01\u0E25\u0E31\u0E1A
+
 CLOSE=\u0E1B\u0E34\u0E14
 
 OK=\u0E15\u0E01\u0E25\u0E07

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_tr.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Taslak
 
 SAVE=Sakla
 
+SAVE_AND_BACK=Kaydet ve geri d\u00F6n
+
 SAVE_AND_EDIT=Sakla ve d\u00FCzenle
 
 SAVE_AND_NEXT=Sakla ve sonraki
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Do\u011Frula
 
 CREATE=Yarat
 
+CREATE_AND_BACK=Olu\u015Ftur ve geri d\u00F6n
+
 CLOSE=Kapat
 
 OK=TAMAM

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_uk.properties

@@ -17,14 +17,18 @@ DRAFT_VERSION=\u0427\u0435\u0440\u043D\u0435\u0442\u043A\u0430
 
 SAVE=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438
 
+SAVE_AND_BACK=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0442\u0430 \u043D\u0430\u0437\u0430\u0434
+
 SAVE_AND_EDIT=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0456 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438
 
-SAVE_AND_NEXT=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0456 \u043F\u0440\u043E\u0434\u043E\u0432\u0436\u0438\u0442\u0438
+SAVE_AND_NEXT=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0442\u0430 \u0434\u0430\u043B\u0456
 
 VALIDATE_DRAFT=\u041F\u0435\u0440\u0435\u0432\u0456\u0440\u0438\u0442\u0438
 
 CREATE=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438
 
+CREATE_AND_BACK=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u0442\u0430 \u043D\u0430\u0437\u0430\u0434
+
 CLOSE=\u0417\u0430\u043A\u0440\u0438\u0442\u0438
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_vi.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=Ba\u0309n tha\u0309o
 
 SAVE=L\u01B0u
 
+SAVE_AND_BACK=L\u01B0u v\u00E0 quay l\u1EA1i
+
 SAVE_AND_EDIT=L\u01B0u va\u0300 hi\u00EA\u0323u chi\u0309nh
 
 SAVE_AND_NEXT=L\u01B0u va\u0300 m\u01A1\u0309 \u0111\u00F4\u0301i t\u01B0\u01A1\u0323ng k\u00EA\u0301 ti\u00EA\u0301p
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=Xa\u0301c th\u01B0\u0323c
 
 CREATE=Ta\u0323o
 
+CREATE_AND_BACK=T\u1EA1o v\u00E0 quay l\u1EA1i
+
 CLOSE=\u0110o\u0301ng
 
 OK=OK

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_zh_CN.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=\u8349\u7A3F
 
 SAVE=\u4FDD\u5B58
 
+SAVE_AND_BACK=\u4FDD\u5B58\u5E76\u8FD4\u56DE
+
 SAVE_AND_EDIT=\u4FDD\u5B58\u5E76\u7F16\u8F91
 
 SAVE_AND_NEXT=\u4FDD\u5B58\u5E76\u7EE7\u7EED
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=\u9A8C\u8BC1
 
 CREATE=\u521B\u5EFA
 
+CREATE_AND_BACK=\u521B\u5EFA\u5E76\u8FD4\u56DE
+
 CLOSE=\u5173\u95ED
 
 OK=\u786E\u5B9A

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_zh_TW.properties

@@ -17,6 +17,8 @@ DRAFT_VERSION=\u8349\u7A3F
 
 SAVE=\u5132\u5B58
 
+SAVE_AND_BACK=\u5132\u5B58\u4E26\u8FD4\u56DE
+
 SAVE_AND_EDIT=\u5132\u5B58\u548C\u7DE8\u8F2F
 
 SAVE_AND_NEXT=\u5132\u5B58\u4E26\u524D\u5F80\u4E0B\u4E00\u6B65
@@ -25,6 +27,8 @@ VALIDATE_DRAFT=\u9A57\u8B49
 
 CREATE=\u5EFA\u7ACB
 
+CREATE_AND_BACK=\u5EFA\u7ACB\u4E26\u8FD4\u56DE
+
 CLOSE=\u95DC\u9589
 
 OK=\u78BA\u5B9A

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.148.1"
+			"version": "1.149.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/view/Details.view.xml

@@ -97,6 +97,7 @@
 														press="._templateEventHandlers.onSwitchDraftAndActiveObjectPopOver"
 														visible="{= ${IsActiveEntity} ? !!(${HasDraftEntity} && ${DraftAdministrativeData/DraftIsCreatedByMe}) : !!${HasActiveEntity} }"
 														enabled="{ui>/enabled}"
+														ariaHasPopup="Menu"
 														type="Transparent">
 													<layoutData>
 														<OverflowToolbarLayoutData priority="NeverOverflow" />

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.148.1"
+			"version": "1.149.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.148.1"
+		"version": "1.149.0"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/detailTemplates/DiscardEditHandler.js

@@ -107,6 +107,15 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 							// Draft discard is a kind of cross navigation -> invalidate paginator info
 							oTemplateUtils.oServices.oApplication.invalidatePaginatorInfo();
 							fnNavigate();
+							// Reset any pending changes that may have been inadvertently created during the unbind/refresh cycle.
+							// During component teardown, SmartFields may fire change events that write back property values into the OData model,
+							// creating stale MERGE requests for draft entities that no longer exist. If these are not cleared, they will be
+							// submitted alongside the next action (e.g. Copy/Edit) in the same changeset, causing "Different strict handling
+							// requested within one changeset" errors (CX_SADL_GW_DIFF_STRICT_HNDL_RQ) because the MERGE lacks the Prefer header.
+							var oModel = oView.getModel();
+							if (oModel && oModel.hasPendingChanges()) {
+								oModel.resetChanges();
+							}
 						};
 					});
 				}

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper.js

@@ -151,44 +151,52 @@ sap.ui.define([
 			};
 		}
 
+		function fnApplyVariantState() {
+			bIsApplyingVariant = true;
+			if (!oPreliminaryState) {
+				// if no state is provided set default variant (not modified)
+				// use cases:
+				// - LR: if appStateKey in the URL that cannot be read
+				// - OP: if switching to different object instance (in discovery mode always, in persistency mode when page was not shown)
+				fnSetVariant(oSmartVariantManagement.getDefaultVariantId());
+			} else if (oPreliminaryState.modified) {
+				// Special logic according to UX: If variant was modified anyway, there's no benefit for the user to see the name (but it could be confusing), so standard variant (not default!) should be
+				// set (which is achieved by empty string)
+				fnSetVariant("");
+				oSmartVariantManagement.currentVariantSetModified(true);
+				// Usually restoring the state of any of the managed controls should mark the variant as dirty, but there might be edge cases (state from an old release not containing information for any
+				// managed control now relevant), so to be on the safe side, we set modified=true explicitly.
+				fnSetManagedControlStates(oPreliminaryState);
+			} else {
+				fnSetVariant(oPreliminaryState.variantId);
+				// if managedControlStates is not provided (legacy or maybe broken state), applying VM state should not break
+				// don't apply undefined to managedControlWrappers, but just leave them untouched
+				if (oPreliminaryState.managedControlStates){
+					if (oSmartFilterBarWrapper) {
+						// SmartFilterBarWrapper.setState is invoked to apply the state changes modified by "modifyStartupExtension"
+						oSmartFilterBarWrapper.setState(oPreliminaryState.managedControlStates[oSmartFilterBarWrapper.getLocalId()]);
+					}
+					if (oPreliminaryState.variantId !== oSmartVariantManagement.getCurrentVariantId()){
+						// variant could not be set because it is not known, i.e. it could be private and URL was shared, or could be deleted after page was bookmarked. In this case,
+						// standard variant is set (by VM). Additionally, it should be marked as modified.
+						oSmartVariantManagement.currentVariantSetModified(true);
+					}
+				}
+			}
+			bIsApplyingVariant = false;
+		}
+
 		function setState(oState) {
 			oPreliminaryState = oState;
 
-			// Wait for all managed controls to be initialized before applying state
-			oAllControlsInitializedPromise.then(function() {
-				bIsApplyingVariant = true;
-				if (!oPreliminaryState) {
-					// if no state is provided set default variant (not modified)
-					// use cases:
-					// - LR: if appStateKey in the URL that cannot be read
-					// - OP: if switching to different object instance (in discovery mode always, in persistency mode when page was not shown)
-					fnSetVariant(oSmartVariantManagement.getDefaultVariantId());
-				} else if (oPreliminaryState.modified) {
-					// Special logic according to UX: If variant was modified anyway, there's no benefit for the user to see the name (but it could be confusing), so standard variant (not default!) should be
-					// set (which is achieved by empty string)
-					fnSetVariant("");
-					oSmartVariantManagement.currentVariantSetModified(true);
-					// Usually restoring the state of any of the managed controls should mark the variant as dirty, but there might be edge cases (state from an old release not containing information for any
-					// managed control now relevant), so to be on the safe side, we set modified=true explicitly.
-					fnSetManagedControlStates(oPreliminaryState);
-				} else {
-					fnSetVariant(oPreliminaryState.variantId);
-					// if managedControlStates is not provided (legacy or maybe broken state), applying VM state should not break
-					// don't apply undefined to managedControlWrappers, but just leave them untouched
-					if (oPreliminaryState.managedControlStates){
-						if (oSmartFilterBarWrapper) {
-							// SmartFilterBarWrapper.setState is invoked to apply the state changes modified by "modifyStartupExtension"
-							oSmartFilterBarWrapper.setState(oPreliminaryState.managedControlStates[oSmartFilterBarWrapper.getLocalId()]);
-						}
-						if (oPreliminaryState.variantId !== oSmartVariantManagement.getCurrentVariantId()){
-							// variant could not be set because it is not known, i.e. it could be private and URL was shared, or could be deleted after page was bookmarked. In this case,
-							// standard variant is set (by VM). Additionally, it should be marked as modified.
-							oSmartVariantManagement.currentVariantSetModified(true);
-						}
-					}
-				}
-				bIsApplyingVariant = false;
-			});
+			// If all managed controls are already initialized (e.g., during iAppState restoration on back-navigation),
+			// apply state synchronously to avoid race condition with loadData() in IappStateHandler.
+			// When controls are not yet initialized (initial app load), defer as before.
+			if (bAllControlsInitialized) {
+				fnApplyVariantState();
+			} else {
+				oAllControlsInitializedPromise.then(fnApplyVariantState);
+			}
 		}
 
 		function attachStateChanged(fnHandler) {

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -959,7 +959,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.148.1
+	 * @version 1.149.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/CRUDManager.js

@@ -577,6 +577,15 @@ sap.ui.define(["sap/ui/base/Object",
 						// If there is at least one new message we assume that the backend has checked the object (and found business errors). Thus, the old messages can be removed and only the new messages
 						// have to stay. However, we delete all messages and then add the new ones. This ensures, that the message model gets a change event even if no message has been there before.
 						// This will trigger the follow-up activities.
+						// Reset pending changes before adding messages to prevent infinite loop when entering edit mode again.
+						// Invalid values cause infinite loop because the pending changes (with invalid values) are resubmitted when the user clicks Edit, triggering the same error.
+						// Must run before addMessages: resetChanges calls _discardEntityChanges which removes messages whose target path starts
+						// with the binding context path — on a sub-object page this would delete the error messages we are about to add.
+						var oContext = oController.getView().getBindingContext();
+						var sContextPath = oContext && oContext.getPath();
+						if (sContextPath && oModel && oModel.hasPendingChanges()) {
+							oModel.resetChanges([sContextPath], undefined, true);
+						}
 						if (aNewMessages.length) {
 							oMessageManager.removeMessages(aAllMessages);
 							oMessageManager.addMessages(aNewMessages);
@@ -589,13 +598,6 @@ sap.ui.define(["sap/ui/base/Object",
 								oServices.oTemplateCapabilities.oMessageButtonHelper.showMessagePopover();
 							}
 						}
-						// Reset pending changes to prevent infinite loop when entering edit mode again.
-						// Invalid values cause infinite loop because the pending changes (with invalid values) are resubmitted when the user clicks Edit, triggering the same error.
-						var oContext = oController.getView().getBindingContext();
-						var sContextPath = oContext && oContext.getPath();
-						if (sContextPath && oModel && oModel.hasPendingChanges()) {
-							oModel.resetChanges([sContextPath], undefined, true);
-						}
 						reject();
 					});
 					oBusyHelper.setBusy(oSubmitChange);

package/src/sap/suite/ui/generic/template/lib/ai/EasyFill/EasyFillAIOrchestrator.js

@@ -164,11 +164,8 @@ sap.ui.define([
                             (typeof oRow._contextPath === "string" || typeof oRow._rowIndex === "number");
                     });
 
-                    // Single-table limitation: only the first valid collection is accepted.
-                    // Future work: extend collectionFields structure to support multiple tables.
                     var oValidation = oFieldCollector.isValidSmartTable(oFieldMeta.entitySet, oObjectPage);
                     if (aRowUpdates.length > 0 &&
-                        Object.keys(oSplitResult.collectionFields).length === 0 &&
                         oValidation.isValid) {
                         oSplitResult.collectionFields[sFieldName] = aRowUpdates;
                         oLogger.debug("splitAIResultByCollection: accepted collection field '" + sFieldName + "' with " + aRowUpdates.length + " rows");

package/src/sap/suite/ui/generic/template/lib/ai/EasyFill/EasyFillHandler.js

@@ -260,9 +260,12 @@ sap.ui.define([
                     null, oObjectPageModel, oController
                 );
 
-                // Update dialog model with section data and AI result
-                oModel.setProperty("/sections", aData);
+                // Update dialog model with section data and AI result.
+                // llmData must be set BEFORE sections so that when the sections binding fires
+                // and triggers the populateSmartFields formatter synchronously, the AI-suggested
+                // values are already available and can be written to the transient context.
                 oModel.setProperty("/llmData", simpleFields);
+                oModel.setProperty("/sections", aData);
 
                 // Process collection/table updates
                 mCollectionUpdates = collectionFields;
@@ -284,7 +287,7 @@ sap.ui.define([
                     }
                 );
 
-                await _refreshTableValidationAndSaveState();
+                 await _refreshTableValidationAndSaveState();
 
                 var iTotalFields = Object.keys(oSplit.updatableFields).length + Object.keys(oSplit.nonUpdatableFields).length;
                 if (iTotalFields === 0 && !bHasTableUpdates) {