Merge remote-tracking branch 'origin/master'

ui/src/pages/OrderEntry.vue

@@ -1088,6 +1088,7 @@ const form = reactive({
   drop: '',
   kategori: '',
   askiliyan: '',
+  yetiskinGarson: '',
   seri: '',
   bedenLabels: [],
   bedenler: [],
@@ -1233,6 +1234,7 @@ async function resetEditor(force = false) {
     urunIcerik: '',
     drop: '',
     askiliyan: '',
+    yetiskinGarson: '',
 
     adet: 0,
     fiyat: 0,
@@ -2661,6 +2663,7 @@ async function onModelChange(modelCode) {
       drop: d.Drop || '',
       kategori: d.Kategori || '',
       askiliyan: d.AskiliYan || '',
+      yetiskinGarson: d.YETISKIN_GARSON || d.YetiskinGarson || d.AskiliYan || '',
       aciklama: keep.aciklama,
       fiyat: keep.fiyat,
       adet: keep.adet,
@@ -2678,7 +2681,7 @@ async function onModelChange(modelCode) {
         null,
         form.urunAnaGrubu,
         form.kategori || form.urunAltGrubu,
-        form.askiliyan
+        form.yetiskinGarson || form.askiliyan
       )
     } catch (e) {
       console.warn('⚠️ detectBedenGroup hata:', e)
@@ -2696,7 +2699,7 @@ async function onModelChange(modelCode) {
         .replace(/[\u0300-\u036f]/g, '')
         .toLowerCase()
         .trim()
-      const ygN = String(form.askiliyan || '')
+      const ygN = String(form.yetiskinGarson || form.askiliyan || '')
         .normalize('NFD')
         .replace(/[\u0300-\u036f]/g, '')
         .toLowerCase()
@@ -2975,8 +2978,8 @@ async function loadOrderInventory(merge = false) {
     // 2️⃣ Form bedenlerine göre map oluştur
     const newMap = {}
     for (const lbl of form.bedenLabels || []) {
-      const key = lbl?.trim() === '' ? ' ' : lbl.trim()
-      newMap[lbl] = invMap[key] ?? 0
+      const key = lbl?.trim() === '' ? ' ' : normalizeBedenLabel(lbl)
+      newMap[lbl] = invMap[key] ?? invMap[lbl] ?? 0
     }
 
     // 3️⃣ Merge veya replace