From 2a8dc5d3a101f7f651a09c5adaef5cb460d0783b Mon Sep 17 00:00:00 2001 From: M_Kececi Date: Mon, 16 Mar 2026 12:13:21 +0300 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ui/src/pages/ProductStockByAttributes.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/src/pages/ProductStockByAttributes.vue b/ui/src/pages/ProductStockByAttributes.vue index 9d44f4d..700fd30 100644 --- a/ui/src/pages/ProductStockByAttributes.vue +++ b/ui/src/pages/ProductStockByAttributes.vue @@ -516,7 +516,9 @@ function resolveKumasValue(item) { return firstText( item?.BIRINCI_PARCA_KUMAS, item?.ProductAtt26Desc, - item?.PRODUCTATT26DESC + item?.PRODUCTATT26DESC, + item?.ProductAtt29Desc, + item?.PRODUCTATT29DESC ) } @@ -524,7 +526,9 @@ function resolveKarisimValue(item) { return firstText( item?.BIRINCI_PARCA_KARISIM, item?.ProductAtt29Desc, - item?.PRODUCTATT29DESC + item?.PRODUCTATT29DESC, + item?.ProductAtt26Desc, + item?.PRODUCTATT26DESC ) }