Skip to content

Commit de61ad0

Browse files
committed
MOCogul, MQKod, FisGirisPart, DRapor,
1 parent aa757da commit de61ad0

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

app/ticari/classes/dRapor/base/dAltRapor/dAltRaporBase_treeGrid.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,14 @@ class DAltRapor_TreeGridGruplu extends DAltRapor_TreeGrid {
233233
if (recs && yatayAnaliz) {
234234
let yatayBelirtec = tabloYapi.grup[DRapor_AraSeviye_Main.yatayTip2Bilgi[yatayAnaliz]?.kod]?.colDefs?.[0]?.belirtec;
235235
if (yatayBelirtec) {
236-
let gtTip2AttrListe = { sabit: [], toplam: [] };
236+
let {grupVeToplam} = tabloYapi, gtTip2AttrListe = { sabit: [], toplam: [] };
237237
for (let colDef of Object.values(belirtec2ColDef).filter(colDef => colDef.belirtec != yatayBelirtec)) {
238238
let toplammi = colDef?.userData?.tip == 'toplam', selector = toplammi ? 'toplam' : 'sabit';
239239
gtTip2AttrListe[selector].push(colDef.belirtec)
240240
}
241241
/*let orj_toplamAttrSet = asSet(gtTip2AttrListe.toplam);
242242
let toplamAttrListe = jqxCols.map(({ datafield }) => datafield).filter(belirtec => orj_toplamAttrSet[belirtec.split('_')[0]]);*/
243-
const item = grupVeToplam[prefix] ?? grupVeToplam[prefix.toUpperCase()], {kodsuzmu} = item || {};
243+
const item = grupVeToplam[yatayBelirtec] ?? grupVeToplam[yatayBelirtec.toUpperCase()], {kodsuzmu} = item || {};
244244
for (let rec of recs) { this.fixKA(rec, yatayBelirtec, kodsuzmu) }
245245
let toplamAttrListe = gtTip2AttrListe.toplam, sevRecs = seviyelendirAttrGruplari({
246246
source: recs, attrGruplari: [gtTip2AttrListe.sabit],

classes/mq/cogul/kod/mqKod.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ class MQKod extends MQCogul {
2222
wh.basiSonu(sec.instKod, `${aliasVeNokta}${kodSaha}`)
2323
})
2424
}
25-
static rootFormBuilderDuzenle(e) { e = e || {}; super.rootFormBuilderDuzenle(e); const tanimForm = e.tanimFormBuilder; tanimForm.add(this.getFormBuilders_ka(e)) }
25+
static rootFormBuilderDuzenle(e) {
26+
e = e || {}; super.rootFormBuilderDuzenle(e); let {kodKullanilirmi} = this;
27+
if (kodKullanilirmi) { let {tanimFormBuilder: tanimForm} = e; if (tanimForm) { tanimForm.add(this.getFormBuilders_ka(e)) } }
28+
}
2629
static getFormBuilders_ka(e) { const _e = $.extend(e, { liste: [] }); this.formBuildersDuzenle_ka(_e); return e.liste }
2730
static formBuildersDuzenle_ka(e) {
2831
const {liste} = e, mfSinif = e.mfSinif ?? this, xEtiket = mfSinif.kodEtiket ?? 'Kod';

config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
global $globalAppName, $appName, $appVersion, $appClass, $shortAppName, $webRoot, $webRoot_ticari;
3-
$globalAppName = 'SkyERP'; $appVersion = '1.30.23';
3+
$globalAppName = 'SkyERP'; $appVersion = '1.30.24';
44
$shortAppName = empty($appClass) ? $globalAppName : $appClass;
55
$webRoot = isset($webRoot) ? $webRoot : '../..'; $webRoot_ticari = "$webRoot/app/ticari"; $webRoot_rapor = "$webRoot/app/rapor"
66
?>

ortak/mq/fisGiris/part.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class FisGirisPart extends GridliGirisWindowPart {
8585
}, 0);
8686
this.noAnimate(); let _e = { ...e, sender, mfSinif: fis.class, fis, islem, layout, islemTuslari, subeForm, baslikFormlar, gridIslemTuslari };
8787
if (this.yeniVeyaKopyami) {
88-
let promise = fis.uiyeniTanimOncesiIslemler(_e); if (promise?.then) {
88+
let promise = fis.yeniTanimOncesiIslemler(_e); if (promise?.then) {
8989
let css = 'opacity-0'; layout.addClass(css);
9090
promise.then(() => this.tazele(_e)).finally(() => setTimeout(() => layout.removeClass(css), 1))
9191
}

0 commit comments

Comments
 (0)