cry-klikvet-logic 1.0.66 → 1.0.68
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/a.txt +368 -0
- package/dist/karticaArtikla.mjs +6 -8
- package/dist/karticaArtikla.mjs.map +1 -1
- package/dist/preveriKnjizenjeZalogeArtikla.d.mts +42 -0
- package/dist/preveriKnjizenjeZalogeArtikla.d.mts.map +1 -0
- package/dist/preveriKnjizenjeZalogeArtikla.mjs +130 -0
- package/dist/preveriKnjizenjeZalogeArtikla.mjs.map +1 -0
- package/dist/spremeniZalogo.d.mts +1 -1
- package/dist/spremeniZalogo.d.mts.map +1 -1
- package/dist/spremeniZalogo.mjs +5 -2
- package/dist/spremeniZalogo.mjs.map +1 -1
- package/dist/spremeniZalogoNaPodlagiRacuna.d.mts.map +1 -1
- package/dist/spremeniZalogoNaPodlagiRacuna.mjs +20 -7
- package/dist/spremeniZalogoNaPodlagiRacuna.mjs.map +1 -1
- package/dist/spremeniZalogoZaDobavo.d.mts.map +1 -1
- package/dist/spremeniZalogoZaDobavo.mjs +13 -4
- package/dist/spremeniZalogoZaDobavo.mjs.map +1 -1
- package/dist/spremeniZalogoZaInventuro.d.mts.map +1 -1
- package/dist/spremeniZalogoZaInventuro.mjs +5 -2
- package/dist/spremeniZalogoZaInventuro.mjs.map +1 -1
- package/dist/spremeniZalogoZaPorabo.d.mts.map +1 -1
- package/dist/spremeniZalogoZaPorabo.mjs +5 -0
- package/dist/spremeniZalogoZaPorabo.mjs.map +1 -1
- package/dist/spremeniZalogoZaPrenos.d.mts.map +1 -1
- package/dist/spremeniZalogoZaPrenos.mjs +5 -0
- package/dist/spremeniZalogoZaPrenos.mjs.map +1 -1
- package/dist/types/artikel.d.mts +1 -1
- package/dist/types/zaloga.d.mts +1 -0
- package/dist/types/zaloga.d.mts.map +1 -1
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/types/rejnaZival.d.mts +0 -8
- package/dist/types/rejnaZival.d.mts.map +0 -1
- package/dist/types/rejnaZival.mjs +0 -2
- package/dist/types/rejnaZival.mjs.map +0 -1
- package/dist/zdruziStranke.d.ts +0 -2
- package/dist/zdruziStranke.d.ts.map +0 -1
- package/dist/zdruziStranke.js +0 -141
- package/dist/zdruziStranke.js.map +0 -1
|
@@ -15,7 +15,7 @@ export type RacunZaKnjizbo = Pick<Racun, "datum" | "skladisce_id" | "_id" | "raz
|
|
|
15
15
|
_id: Id;
|
|
16
16
|
};
|
|
17
17
|
};
|
|
18
|
-
export type ArtikelZaRazknjizbo = Pick<ArtikelKarkoli, "_id" | "zalogoRazknjizi" | "nbc" | "zadnjaNbc" | "zadnjaNbcObSpremembiMpc" | "vodenjeZaloge" | "faktorRazknjizbe" | "razknjiziZalogo" | "enotaFaktor" | "enotaZaloge" | "enotaNabave" | "zeleniPribitek" | "dst" | "mpc" | "mpcLocked" | "zadnjiDobavitelj" | "zadnjaDobava" | "zadnjaProdaja"> & {
|
|
18
|
+
export type ArtikelZaRazknjizbo = Pick<ArtikelKarkoli, "_id" | "zalogoRazknjizi" | "nbc" | "zadnjaNbc" | "zadnjaNbcObSpremembiMpc" | "vodenjeZaloge" | "faktorRazknjizbe" | "razknjiziZalogo" | "enotaFaktor" | "enotaZaloge" | "enotaNabave" | "zeleniPribitek" | "dst" | "mpc" | "mpcLocked" | "zadnjiDobavitelj" | "zadnjaDobava" | "zadnjaProdaja" | "zadnjaInventura" | "naziv"> & {
|
|
19
19
|
kategorija: "izdelek" | "zdravilo";
|
|
20
20
|
};
|
|
21
21
|
export declare function knjiziPoEnotiNabave(vrsta: VrstaBlagovnice): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spremeniZalogo.d.mts","sourceRoot":"","sources":["../src/spremeniZalogo.mts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAqB,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,UAAU,EAAwC,4BAA4B,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAClJ,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAmB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAQ9G,MAAM,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,EAAE,gBAAgB,GAAG,uBAAuB,GAAG,wBAAwB,GAAG,sBAAsB,GAC1I,+BAA+B,GAAG,gCAAgC,GAAG,mBAAmB,GAAG,oBAAoB,GAAG,oBAAoB,GAAG,sBAAsB,CAAE,CAAA;AAEvK,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,MAAM,GAAG,UAAU,GAAG,YAAY,GAAG,2BAA2B,GAAG,kBAAkB,GAAG,0BAA0B,GAAG,QAAQ,CAAC,CAAA;AACxM,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,cAAc,GAAG,KAAK,GAAG,YAAY,GAAG,OAAO,GAAG,UAAU,GAAG,aAAa,GAAG,sBAAsB,GAAG,aAAa,CAAC,GACnK;IAAE,QAAQ,EAAE,uBAAuB,EAAE,CAAA;CAAE,GACvC;IAAE,OAAO,CAAC,EAAE;QAAE,GAAG,EAAE,EAAE,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhC,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,cAAc,EACjD,KAAK,GAAG,iBAAiB,GAAG,KAAK,GAAG,WAAW,GAAG,yBAAyB,GAAG,eAAe,GAC3F,kBAAkB,GAAG,iBAAiB,GACtC,aAAa,GAAG,aAAa,GAAG,aAAa,GAC7C,gBAAgB,GAAG,KAAK,GAAG,KAAK,GAAG,WAAW,GAC9C,kBAAkB,GAAG,cAAc,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"spremeniZalogo.d.mts","sourceRoot":"","sources":["../src/spremeniZalogo.mts"],"names":[],"mappings":"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"}
|
package/dist/spremeniZalogo.mjs
CHANGED
|
@@ -86,10 +86,13 @@ export async function _poknjiziPoraboZaloge(zaloga, blagovniDogodek, postavka, s
|
|
|
86
86
|
zaloga: sprememba.zaloga.nova,
|
|
87
87
|
vrednost: sprememba.vrednostZaloge.nova,
|
|
88
88
|
});
|
|
89
|
+
let datum = new Date(new Date().valueOf());
|
|
90
|
+
let datumDokumenta = new Date(blagovnica.datum);
|
|
89
91
|
await mongo.insert("spremembaZaloge", {
|
|
90
92
|
_id: new ObjectID().toHexString(),
|
|
91
|
-
datum:
|
|
92
|
-
...razpisiDatum(
|
|
93
|
+
datum: datum,
|
|
94
|
+
...razpisiDatum(datum),
|
|
95
|
+
datumDokumenta,
|
|
93
96
|
artikel_id: artikel._id,
|
|
94
97
|
skladisce_id: zaloga.skladisce_id,
|
|
95
98
|
dokument_id: blagovnica._id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spremeniZalogo.mjs","sourceRoot":"","sources":["../src/spremeniZalogo.mts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"spremeniZalogo.mjs","sourceRoot":"","sources":["../src/spremeniZalogo.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spremeniZalogoNaPodlagiRacuna.d.mts","sourceRoot":"","sources":["../src/spremeniZalogoNaPodlagiRacuna.mts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EAAE,cAAc,EAA4B,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"spremeniZalogoNaPodlagiRacuna.d.mts","sourceRoot":"","sources":["../src/spremeniZalogoNaPodlagiRacuna.mts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EAAE,cAAc,EAA4B,MAAM,sBAAsB,CAAC;AAMhF,wBAAsB,6BAA6B,CAAC,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,mCAAmC,GAAG,oBAAoB,GAAG,mBAAmB,GAAG,oBAAoB,GAAE,6BAA6B,CAAC,EAAE,KAAK,EAAE,gBAAgB,iBAiKvQ"}
|
|
@@ -4,6 +4,7 @@ import { razpisiDatum } from './razpisiDatum.mjs';
|
|
|
4
4
|
import { poisciInPreusmeriArtikel } from './spremeniZalogo.mjs';
|
|
5
5
|
import { odstraniSerijskeStevilke } from './serije.mjs';
|
|
6
6
|
import { aliRazknjizujemoNaLokaciji } from './aliRazknjizujemoNaLokaciji.mjs';
|
|
7
|
+
import dayjs from './dayjs.mjs';
|
|
7
8
|
export async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
8
9
|
if (!racun || racun.razknjizen || racun.razknjizbaPreskocena || racun._deleted)
|
|
9
10
|
return;
|
|
@@ -19,6 +20,7 @@ export async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
|
19
20
|
let vrstaDogodka = "prodaja";
|
|
20
21
|
let vrstaSpremembe = -1 /* VrstaSpremembeZaloge.PORABA */;
|
|
21
22
|
let vpisaliSmoSerijske = 0;
|
|
23
|
+
let promises = [];
|
|
22
24
|
try {
|
|
23
25
|
//await mongo.startTransaction();
|
|
24
26
|
for await (let postavka of racun.postavke) {
|
|
@@ -43,14 +45,16 @@ export async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
|
43
45
|
continue;
|
|
44
46
|
}
|
|
45
47
|
;
|
|
46
|
-
|
|
47
|
-
zadnjaProdaja: racun.datum
|
|
48
|
-
});
|
|
48
|
+
promises.push(mongo.upsert("artikli", { _id: postavka.artikel_id }, { zadnjaProdaja: racun.datum }));
|
|
49
49
|
if (["storitev", "potrošni material"].includes(postavka.kategorija))
|
|
50
50
|
continue;
|
|
51
51
|
let { artikel, faktorRazknjizbe } = await poisciInPreusmeriArtikel(postavka.artikel_id, 1, mongo, `ni artikla za razknjižbo prodaje: ${postavka.artikel_id} - ${postavka.opis}`);
|
|
52
52
|
if (!artikel)
|
|
53
53
|
continue;
|
|
54
|
+
if (artikel.zadnjaInventura && dayjs(artikel.zadnjaInventura).isAfter(racun.datum)) {
|
|
55
|
+
console.warn(`preskoči knjižbo računa po zadnji inventuri (datum računa ${dayjs(racun.datum).format("D.M.YYYY")}, artikel ${artikel._id} ${artikel.naziv}, zadnja inventura ${dayjs(artikel.zadnjaInventura).format("D.M.YYYY")}`);
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
54
58
|
let z = await mongo.findOne("zaloga", { skladisce_id: racun.skladisce_id, artikel_id: artikel._id });
|
|
55
59
|
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: racun.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
|
56
60
|
let razknjiziZalogo = artikel.zalogoRazknjizi === "ob prodaji"
|
|
@@ -71,14 +75,17 @@ export async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
|
71
75
|
zaloga: zaloga.zaloga,
|
|
72
76
|
vrednost: zaloga.vrednost,
|
|
73
77
|
});
|
|
74
|
-
|
|
78
|
+
let datum = new Date(new Date().valueOf());
|
|
79
|
+
let datumDokumenta = new Date(racun.datum);
|
|
80
|
+
promises.push(mongo.insert("spremembaZaloge", {
|
|
75
81
|
_id: new ObjectID().toHexString(),
|
|
76
|
-
datum:
|
|
77
|
-
...razpisiDatum(
|
|
82
|
+
datum: datum,
|
|
83
|
+
...razpisiDatum(datum),
|
|
78
84
|
artikel_id: artikel._id,
|
|
79
85
|
skladisce_id: zaloga.skladisce_id,
|
|
80
86
|
kategorija: artikel.kategorija,
|
|
81
87
|
dokument_id: racun._id,
|
|
88
|
+
datumDokumenta,
|
|
82
89
|
vrstaSpremembe,
|
|
83
90
|
vrstaDogodka,
|
|
84
91
|
partner_id: racun.stranka?._id,
|
|
@@ -86,7 +93,7 @@ export async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
|
86
93
|
zaloga: sprememba.zaloga,
|
|
87
94
|
vrednostZaloge: sprememba.vrednostZaloge,
|
|
88
95
|
dst: artikel.dstIn || artikel.dst,
|
|
89
|
-
});
|
|
96
|
+
}));
|
|
90
97
|
// if (Math.abs(round2(zaloga.vrednost - sprememba.vrednostZaloge.nova)) > .2)
|
|
91
98
|
// console.log("račun razlika zaloge", artikel._id, (artikel as any).naziv, zaloga.vrednost, "-", sprememba.vrednostZaloge.nova, "=", zaloga.vrednost - sprememba.vrednostZaloge.nova)
|
|
92
99
|
// if (Math.abs(round2(sprememba.vrednostZaloge.stara+sprememba.vrednostZaloge.sprememba - sprememba.vrednostZaloge.nova)) > .2)
|
|
@@ -114,6 +121,12 @@ export async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
|
114
121
|
console.log('postavka', postavka.opis, postavka.artikel_id, postavka.kolicina);
|
|
115
122
|
}
|
|
116
123
|
} // postavke
|
|
124
|
+
try {
|
|
125
|
+
await Promise.all(promises);
|
|
126
|
+
}
|
|
127
|
+
catch (err) {
|
|
128
|
+
console.error("spremeniZalogoNaPodlagiRacuna Promise.all", err);
|
|
129
|
+
}
|
|
117
130
|
let update = { razknjizen: new Date() };
|
|
118
131
|
if (vpisaliSmoSerijske)
|
|
119
132
|
update.postavke = racun.postavke;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spremeniZalogoNaPodlagiRacuna.mjs","sourceRoot":"","sources":["../src/spremeniZalogoNaPodlagiRacuna.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAOhF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAkB,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"spremeniZalogoNaPodlagiRacuna.mjs","sourceRoot":"","sources":["../src/spremeniZalogoNaPodlagiRacuna.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaDobavo.d.mts","sourceRoot":"","sources":["../src/spremeniZalogoZaDobavo.mts"],"names":[],"mappings":"AAMA,OAAO,EAAc,MAAM,EAAwC,MAAM,wBAAwB,CAAC;AAIlG,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAIhE,OAAO,EAAE,kBAAkB,EAAwB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"spremeniZalogoZaDobavo.d.mts","sourceRoot":"","sources":["../src/spremeniZalogoZaDobavo.mts"],"names":[],"mappings":"AAMA,OAAO,EAAc,MAAM,EAAwC,MAAM,wBAAwB,CAAC;AAIlG,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAIhE,OAAO,EAAE,kBAAkB,EAAwB,MAAM,sBAAsB,CAAC;AAOhF,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAC,kBAAkB,EAAE,KAAK,EAAE,gBAAgB,oBAwHtH"}
|
|
@@ -7,6 +7,7 @@ import { razpisiDatum } from './razpisiDatum.mjs';
|
|
|
7
7
|
import { lahkoImaZalogo } from './lahkoImaZalogo.mjs';
|
|
8
8
|
import { zeleniPribitek } from './zeleniPribitek.mjs';
|
|
9
9
|
import { dodajSerijskeStevilke } from './serije.mjs';
|
|
10
|
+
import dayjs from './dayjs.mjs';
|
|
10
11
|
export async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
|
11
12
|
let avtomatskaRazknjizba = {
|
|
12
13
|
_id: Repo.newid().toHexString(),
|
|
@@ -56,6 +57,10 @@ export async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
|
|
56
57
|
console.error(`ni artikla za razkljižbo od dobavi: ${postavka.artikel_id} - ${postavka.naziv}`);
|
|
57
58
|
continue;
|
|
58
59
|
}
|
|
60
|
+
if (artikel.zadnjaInventura && dayjs(artikel.zadnjaInventura).isAfter(blagovnica.datum)) {
|
|
61
|
+
console.warn(`preskoči knjižbo dobave po zadnji inventuri (datum računa ${dayjs(blagovnica.datum).format("D.M.YYYY")}, artikel ${artikel._id} ${artikel.naziv}, zadnja inventura ${dayjs(artikel.zadnjaInventura).format("D.M.YYYY")}`);
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
59
64
|
let z = await mongo.findOne("zaloga", { skladisce_id: blagovnica.skladisce_id, artikel_id: postavka.artikel_id });
|
|
60
65
|
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
|
61
66
|
if (!postavka.enotaFaktor)
|
|
@@ -125,10 +130,13 @@ async function vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mon
|
|
|
125
130
|
vrednost: sprememba.vrednostZaloge.nova,
|
|
126
131
|
});
|
|
127
132
|
}
|
|
133
|
+
let datum = new Date(new Date().valueOf() + n);
|
|
134
|
+
let datumDokumenta = new Date(blagovnica.datum);
|
|
128
135
|
await mongo.insert("spremembaZaloge", {
|
|
129
136
|
_id: new ObjectID().toHexString(),
|
|
130
|
-
datum: new Date(
|
|
131
|
-
...razpisiDatum(
|
|
137
|
+
datum: new Date(datum),
|
|
138
|
+
...razpisiDatum(datum),
|
|
139
|
+
datumDokumenta,
|
|
132
140
|
artikel_id: artikel._id,
|
|
133
141
|
skladisce_id: zaloga.skladisce_id,
|
|
134
142
|
dokument_id: blagovnica._id,
|
|
@@ -144,11 +152,12 @@ async function vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mon
|
|
|
144
152
|
if (razknjizimoTakoj) {
|
|
145
153
|
await mongo.insert("spremembaZaloge", {
|
|
146
154
|
_id: new ObjectID().toHexString(),
|
|
147
|
-
datum:
|
|
148
|
-
...razpisiDatum(
|
|
155
|
+
datum: datum,
|
|
156
|
+
...razpisiDatum(datum),
|
|
149
157
|
artikel_id: artikel._id,
|
|
150
158
|
skladisce_id: zaloga.skladisce_id,
|
|
151
159
|
dokument_id: blagovnica._id,
|
|
160
|
+
datumDokumenta,
|
|
152
161
|
kategorija: artikel.kategorija,
|
|
153
162
|
vrstaSpremembe: -1 /* VrstaSpremembeZaloge.PORABA */,
|
|
154
163
|
vrstaDogodka: 'poraba',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaDobavo.mjs","sourceRoot":"","sources":["../src/spremeniZalogoZaDobavo.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAQxF,OAAO,EAAE,sCAAsC,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAEtH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"spremeniZalogoZaDobavo.mjs","sourceRoot":"","sources":["../src/spremeniZalogoZaDobavo.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaInventuro.d.mts","sourceRoot":"","sources":["../src/spremeniZalogoZaInventuro.mts"],"names":[],"mappings":"AAIA,OAAO,EAAc,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAKhE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAI9E,wBAAsB,yBAAyB,CAAC,UAAU,EAAE,SAAS,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,uBAAuB,GAAC,SAAS,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"spremeniZalogoZaInventuro.d.mts","sourceRoot":"","sources":["../src/spremeniZalogoZaInventuro.mts"],"names":[],"mappings":"AAIA,OAAO,EAAc,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAKhE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAI9E,wBAAsB,yBAAyB,CAAC,UAAU,EAAE,SAAS,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,uBAAuB,GAAC,SAAS,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,oBA0I3O"}
|
|
@@ -55,10 +55,13 @@ export async function spremeniZalogoZaInventuro(blagovnica, privzetaRazknjizaZdr
|
|
|
55
55
|
// console.log("spremeniZalogoZaInventuro: postavka.tnbc - sprememba.vrednostZaloge.sprememba,",postavka.tnbc, sprememba.vrednostZaloge.sprememba)
|
|
56
56
|
// if (Math.abs(round2(sprememba.vrednostZaloge.stara + sprememba.vrednostZaloge.sprememba - sprememba.vrednostZaloge.nova)) > .2)
|
|
57
57
|
// console.log("račun spr", artikel._id, (artikel as any).naziv, zaloga.vrednost, "-", sprememba.vrednostZaloge.nova, "=", zaloga.vrednost - sprememba.vrednostZaloge.nova)
|
|
58
|
+
let datum = new Date(new Date().valueOf());
|
|
59
|
+
let datumDokumenta = new Date(blagovnica.datum);
|
|
58
60
|
await mongo.insert("spremembaZaloge", {
|
|
59
61
|
_id: new ObjectID().toHexString(),
|
|
60
|
-
datum:
|
|
61
|
-
...razpisiDatum(
|
|
62
|
+
datum: datum,
|
|
63
|
+
...razpisiDatum(datum),
|
|
64
|
+
datumDokumenta,
|
|
62
65
|
artikel_id: artikel._id,
|
|
63
66
|
skladisce_id: zaloga.skladisce_id,
|
|
64
67
|
dokument_id: blagovnica._id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaInventuro.mjs","sourceRoot":"","sources":["../src/spremeniZalogoZaInventuro.mts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"spremeniZalogoZaInventuro.mjs","sourceRoot":"","sources":["../src/spremeniZalogoZaInventuro.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAMnF,OAAO,EAAE,sCAAsC,EAAE,uCAAuC,EAAE,MAAM,oCAAoC,CAAC;AACrI,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,qBAAqB,EAAE,iCAAiC,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGvG,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,UAAqB,EAAE,wBAAiD,EAAE,yBAA4D,EAAE,kBAA2B,EAAE,KAAuB;IAExO,IAAI,KAAK,EAAE,IAAI,QAAQ,IAAI,UAAU,CAAC,QAAQ,EAAE;QAE5C,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC;YAC/D,SAAS;QAEb,IAAI,SAAS,GAAI,UAAU,CAAC,QAAqC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACrJ,IAAI,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,OAAO,CAAkB,iBAAiB,EAAE;YAC1F,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,YAAY,EAAE,UAAU,CAAC,YAAY;YACrC,WAAW,EAAE,UAAU,CAAC,GAAG;SAC9B,CAAC,CAAA;QACF,IAAI,WAAW,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,mEAAmE,GAAG,UAAU,CAAC,GAAG,EAAE;gBAChG,UAAU,EAAE,QAAQ,CAAC,UAAU;gBAC/B,YAAY,EAAE,UAAU,CAAC,YAAY;gBACrC,WAAW,EAAE,UAAU,CAAC,GAAG;aAC9B,CAAC,CAAA;YACF,SAAS;SACZ;QAAA,CAAC;QAEF,IAAI,OAAO,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,EAAE,IAAE,SAAS,8BAA8B,QAAQ,CAAC,UAAU,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;QAC9J,IAAI,CAAC,OAAO;YACR,SAAS;QAGb,IAAI,CAAC,UAAU,CAAC,iBAAiB,IAAI,CAAC,QAAQ,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,CAAC;YAC1I,SAAS;QAEb,IAAI,CAAC,GAAG,MAAM,KAAK,CAAC,OAAO,CAAS,QAAQ,EAAE,EAAE,YAAY,EAAE,UAAU,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAClH,IAAI,MAAM,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,QAAQ,EAAE,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,GAAI,EAAE,YAAY,EAAE,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QAEzJ,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACjC,QAAQ,CAAC,GAAG,GAAG,SAAS,CAAC;QAEzB,IAAI,QAAQ,CAAC,gBAAgB,KAAG,SAAS,EAAE;YACvC,OAAO,CAAC,KAAK,CAAC,wCAAwC,UAAU,CAAC,GAAG,eAAe,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;YACjG,SAAS;SACZ;QAED,IAAI,SAAS,GAAG,mBAAmB,CAAC;YAChC,cAAc,sCAA8B;YAC5C,MAAM;YACN,QAAQ,EAAE,QAAQ,CAAC,gBAAgB,GAAG,CAAC,QAAQ,CAAC,WAAW,IAAE,CAAC,CAAC;YAC/D,SAAS;SACZ,CAAC,CAAC;QACH,MAAM,GAAG,oBAAoB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEjD,MAAM,KAAK,CAAC,MAAM,CAAS,QAAQ,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,EAC/F;YACI,GAAG,EAAE,SAAS;YACd,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,IAAI;YAC7B,QAAQ,EAAE,SAAS,CAAC,cAAc,CAAC,IAAI;SAC1C,CACJ,CAAC;QAEF,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC;QAC/C,uCAAuC,CAAC,QAAQ,CAAC,CAAC;QAElD,yEAAyE;QACzE,sJAAsJ;QAEtJ,kIAAkI;QAClI,+KAA+K;QAE/K,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3C,IAAI,cAAc,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAEhD,MAAM,KAAK,CAAC,MAAM,CAAkB,iBAAiB,EAAE;YACnD,GAAG,EAAE,IAAI,QAAQ,EAAE,CAAC,WAAW,EAAE;YACjC,KAAK,EAAE,KAAK;YACZ,GAAG,YAAY,CAAC,KAAK,CAAC;YACtB,cAAc;YACd,UAAU,EAAE,OAAO,CAAC,GAAI;YACxB,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,WAAW,EAAE,UAAU,CAAC,GAAG;YAC3B,cAAc,EAAE,SAAS,CAAC,cAAc;YACxC,YAAY,EAAE,UAAU,CAAC,KAAK;YAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,+BAA+B;YAC/B,MAAM,EAAE,SAAS,CAAC,MAAM;YACxB,cAAc,EAAE,SAAS,CAAC,cAAc;YACxC,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE;YACxD,GAAG,EAAG,OAA8B,CAAC,KAAK,IAAK,OAA8B,CAAC,GAAG;SACpF,CAAC,CAAC;QAEH,gFAAgF;QAChF,8LAA8L;QAE9L,kIAAkI;QAClI,6KAA6K;QAG7K,IAAI,kBAAkB,EAAE;YACpB,IAAI,IAAI,GAA0C;gBAC9C,UAAU,EAAE,QAAQ,CAAC,UAAU;gBAC/B,YAAY,EAAE,UAAU,CAAC,YAAY;gBACrC,GAAG,EAAE,WAAW;gBAChB,SAAS,EAAE,UAAU,CAAC,OAAO;gBAC7B,WAAW,EAAE,UAAU,CAAC,GAAG;aAC9B,CAAA;YAED,MAAM,iCAAiC,CAAC;gBACpC,GAAG,IAAoC;gBACvC,MAAM,EAAE,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,gBAAgB;aAC3E,EAAE,KAAK,CAAC,CAAC;YAEV,IAAI,CAAC,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE;gBACpC,IAAI,MAAM,GAAG,MAAM,qBAAqB,CAAC;oBACrC,GAAG,IAAoC;oBACvC,QAAQ,EAAE,QAAQ,CAAC,eAAe;oBAClC,OAAO,EAAE,QAAQ,CAAC,gBAAgB;iBACrC,EAAE,KAAK,CAAC,CAAA;gBACT,QAAQ,CAAC,uBAAuB,GAAG,QAAQ,CAAC,eAAe,CAAC;gBAC5D,QAAQ,CAAC,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;aACzE;SACJ;QAED,MAAM,KAAK,CAAC,MAAM,CAAU,SAAS,EACjC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,GAAG,EACrB,EAAE,eAAe,EAAE,UAAU,CAAC,KAAK,EAAE,CACxC,CAAA;KAEJ;IAED,IAAI,SAAS,GAAuC;QAChD,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,WAAW,EAAE,IAAI,IAAI,EAAE;QACvB,GAAG,sCAAsC,CAAC,UAAU,CAAC,QAAQ,CAAC;QAC9D,GAAG,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC;QACjC,CAAC,EAAE,CAAC;KACP,CAAC;IAEF,MAAM,KAAK,CAAC,MAAM,CAAa,YAAY,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;IAEjF,OAAO,KAAK,CAAA;AAEhB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaPorabo.d.mts","sourceRoot":"","sources":["../src/spremeniZalogoZaPorabo.mts"],"names":[],"mappings":"AACA,OAAO,EAAc,iBAAiB,EAAgC,MAAM,wBAAwB,CAAC;AAErG,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"spremeniZalogoZaPorabo.d.mts","sourceRoot":"","sources":["../src/spremeniZalogoZaPorabo.mts"],"names":[],"mappings":"AACA,OAAO,EAAc,iBAAiB,EAAgC,MAAM,wBAAwB,CAAC;AAErG,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIlD,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,iBAAiB,GAAG,SAAS,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,0BAA0B,EAAE,uBAAuB,GAAC,SAAS,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,UAAU,UAAM,oBAsEhR"}
|
|
@@ -2,6 +2,7 @@ import { ObjectID } from './ObjectId.mjs';
|
|
|
2
2
|
import { poisciArtikel, _poknjiziPoraboZaloge } from './spremeniZalogo.mjs';
|
|
3
3
|
import { lahkoImaZalogo } from './lahkoImaZalogo.mjs';
|
|
4
4
|
import { odstraniSerijskeStevilke } from './serije.mjs';
|
|
5
|
+
import dayjs from './dayjs.mjs';
|
|
5
6
|
export async function spremeniZalogoZaPorabo(blagovnica, privzetaRazknjizbaZdravil, privzetaRazknjizbaIzdelkov, spremljamoSerijske, mongo, brezRocnih = false) {
|
|
6
7
|
let vpisaliSmoSerijske = false;
|
|
7
8
|
for await (let postavka of blagovnica.postavke) {
|
|
@@ -35,6 +36,10 @@ export async function spremeniZalogoZaPorabo(blagovnica, privzetaRazknjizbaZdrav
|
|
|
35
36
|
continue;
|
|
36
37
|
if (brezRocnih && artikel.kategorija === "izdelek" && privzetaRazknjizbaIzdelkov === "ročno")
|
|
37
38
|
continue;
|
|
39
|
+
if (artikel.zadnjaInventura && dayjs(artikel.zadnjaInventura).isAfter(blagovnica.datum)) {
|
|
40
|
+
console.warn(`preskoči knjižbo porabe po zadnji inventuri (datum računa ${dayjs(blagovnica.datum).format("D.M.YYYY")}, artikel ${artikel._id} ${artikel.naziv}, zadnja inventura ${dayjs(artikel.zadnjaInventura).format("D.M.YYYY")}`);
|
|
41
|
+
continue;
|
|
42
|
+
}
|
|
38
43
|
let z = await mongo.findOne("zaloga", { skladisce_id: blagovnica.skladisce_id, artikel_id: artikel._id });
|
|
39
44
|
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
|
40
45
|
let vrsta = blagovnica.vrsta || "dobavnica";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaPorabo.mjs","sourceRoot":"","sources":["../src/spremeniZalogoZaPorabo.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI1C,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"spremeniZalogoZaPorabo.mjs","sourceRoot":"","sources":["../src/spremeniZalogoZaPorabo.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaPrenos.d.mts","sourceRoot":"","sources":["../src/spremeniZalogoZaPrenos.mts"],"names":[],"mappings":"AAEA,OAAO,EAAc,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"spremeniZalogoZaPrenos.d.mts","sourceRoot":"","sources":["../src/spremeniZalogoZaPrenos.mts"],"names":[],"mappings":"AAEA,OAAO,EAAc,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAK9E,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,uBAAuB,GAAC,SAAS,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK,EAAE,gBAAgB,oBAsGrO"}
|
|
@@ -3,6 +3,7 @@ import { ObjectID } from './ObjectId.mjs';
|
|
|
3
3
|
import { poisciArtikel, _poknjiziPoraboZaloge } from './spremeniZalogo.mjs';
|
|
4
4
|
import { lahkoImaZalogo } from './lahkoImaZalogo.mjs';
|
|
5
5
|
import { prestaviSerijskeStevilkeMedSkladisci } from './serije.mjs';
|
|
6
|
+
import dayjs from './dayjs.mjs';
|
|
6
7
|
export async function spremeniZalogoZaPrenos(blagovnica, privzetaRazknjizaZdravil, privzetaRazknjizaIzdelkov, spremljamoSerijske, mongo) {
|
|
7
8
|
// pri prenosu: vhodno blagovnico spremenimo v "iznos",
|
|
8
9
|
// nato naredimo podvojeno blagovnico "vnos"
|
|
@@ -60,6 +61,10 @@ export async function spremeniZalogoZaPrenos(blagovnica, privzetaRazknjizaZdravi
|
|
|
60
61
|
continue;
|
|
61
62
|
if (!lahkoImaZalogo(artikel, privzetaRazknjizaZdravil, privzetaRazknjizaIzdelkov))
|
|
62
63
|
continue;
|
|
64
|
+
if (artikel.zadnjaInventura && dayjs(artikel.zadnjaInventura).isAfter(blagovnica.datum)) {
|
|
65
|
+
console.warn(`preskoči knjižbo prenosa po zadnji inventuri (datum računa ${dayjs(blagovnica.datum).format("D.M.YYYY")}, artikel ${artikel._id} ${artikel.naziv}, zadnja inventura ${dayjs(artikel.zadnjaInventura).format("D.M.YYYY")}`);
|
|
66
|
+
continue;
|
|
67
|
+
}
|
|
63
68
|
let iz_zaloge = await mongo.findOne("zaloga", { skladisce_id: blagovnica.iz_skladisca_id, artikel_id: artikel._id, });
|
|
64
69
|
iz_zaloge = iz_zaloge || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.iz_skladisca_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
|
65
70
|
let na_zalogo = await mongo.findOne("zaloga", { skladisce_id: blagovnica.v_skladisce_id, artikel_id: artikel._id, });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaPrenos.mjs","sourceRoot":"","sources":["../src/spremeniZalogoZaPrenos.mts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI1C,OAAO,EAAE,aAAa,EAAiC,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE3G,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,oCAAoC,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"spremeniZalogoZaPrenos.mjs","sourceRoot":"","sources":["../src/spremeniZalogoZaPrenos.mts"],"names":[],"mappings":"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"}
|
package/dist/types/artikel.d.mts
CHANGED
|
@@ -88,7 +88,7 @@ export declare function jeMaterial(a: {
|
|
|
88
88
|
export declare function jeStoritev(a: {
|
|
89
89
|
kategorija: Kategorija;
|
|
90
90
|
}): a is Storitev;
|
|
91
|
-
export declare function vrniKategorijo(a: ArtikelOsnova): Izdelek |
|
|
91
|
+
export declare function vrniKategorijo(a: ArtikelOsnova): Izdelek | Storitev | Zdravilo | PotrosniMaterial;
|
|
92
92
|
export type Artikel = Izdelek | Zdravilo | Storitev | PotrosniMaterial;
|
|
93
93
|
export {};
|
|
94
94
|
//# sourceMappingURL=artikel.d.mts.map
|
package/dist/types/zaloga.d.mts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zaloga.d.mts","sourceRoot":"","sources":["../../src/types/zaloga.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,WAAW,MAAO,SAAQ,QAAQ;IAEpC,UAAU,EAAE,EAAE,CAAA;IACd,YAAY,EAAE,EAAE,CAAA;IAChB,GAAG,EAAE,KAAK,CAAA;IACV,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,KAAK,CAAA;CAElB;AAED,MAAM,WAAW,eAAgB,SAAQ,QAAQ,EAAE,aAAa;IAE5D,KAAK,EAAE,IAAI,CAAA;IACX,UAAU,EAAE,EAAE,CAAA;IACd,YAAY,EAAE,EAAE,CAAA;IAEhB,GAAG,EAAE,OAAO,CAAA;IACZ,UAAU,EAAE,UAAU,CAAA;IAEtB,cAAc,EAAE,oBAAoB,CAAA;IACpC,YAAY,EAAE,sBAAsB,CAAA;IACpC,WAAW,EAAE,EAAE,CAAA;IACf,UAAU,CAAC,EAAE,EAAE,CAAA;IAEf,GAAG,EAAE;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,IAAI,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,KAAK,CAAA;KAAE,CAAA;IACpD,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,CAAA;IAC7D,cAAc,EAAE;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,IAAI,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,KAAK,CAAA;KAAE,CAAA;CAElE;AAED,MAAM,WAAW,WAAW;IACxB,KAAK,EAAE,IAAI,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAA;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAA;CACxC;AAED,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB,EAAE,MAAM,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAC;CAChC"}
|
|
1
|
+
{"version":3,"file":"zaloga.d.mts","sourceRoot":"","sources":["../../src/types/zaloga.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,WAAW,MAAO,SAAQ,QAAQ;IAEpC,UAAU,EAAE,EAAE,CAAA;IACd,YAAY,EAAE,EAAE,CAAA;IAChB,GAAG,EAAE,KAAK,CAAA;IACV,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,KAAK,CAAA;CAElB;AAED,MAAM,WAAW,eAAgB,SAAQ,QAAQ,EAAE,aAAa;IAE5D,KAAK,EAAE,IAAI,CAAA;IACX,UAAU,EAAE,EAAE,CAAA;IACd,YAAY,EAAE,EAAE,CAAA;IAEhB,GAAG,EAAE,OAAO,CAAA;IACZ,UAAU,EAAE,UAAU,CAAA;IAEtB,cAAc,EAAE,oBAAoB,CAAA;IACpC,YAAY,EAAE,sBAAsB,CAAA;IACpC,WAAW,EAAE,EAAE,CAAA;IACf,UAAU,CAAC,EAAE,EAAE,CAAA;IAEf,cAAc,CAAC,EAAE,IAAI,CAAA;IAErB,GAAG,EAAE;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,IAAI,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,KAAK,CAAA;KAAE,CAAA;IACpD,MAAM,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,CAAA;IAC7D,cAAc,EAAE;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,IAAI,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,KAAK,CAAA;KAAE,CAAA;CAElE;AAED,MAAM,WAAW,WAAW;IACxB,KAAK,EAAE,IAAI,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAA;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAA;CACxC;AAED,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB,EAAE,MAAM,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAC;CAChC"}
|