cry-klikvet-logic 0.10.148 → 0.10.150
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/dist/ObjectId.js +3 -9
- package/dist/ObjectId.js.map +1 -1
- package/dist/calcTimeQuery.js +3 -7
- package/dist/calcTimeQuery.js.map +1 -1
- package/dist/certs.d.ts +1 -1
- package/dist/certs.d.ts.map +1 -1
- package/dist/certs.js +7 -14
- package/dist/certs.js.map +1 -1
- package/dist/davki.js +4 -8
- package/dist/davki.js.map +1 -1
- package/dist/dayjs.js +4 -9
- package/dist/dayjs.js.map +1 -1
- package/dist/ensureIndexes.js +3 -7
- package/dist/ensureIndexes.js.map +1 -1
- package/dist/idjiArtiklovKiImajoLahkoZalogo.js +5 -9
- package/dist/idjiArtiklovKiImajoLahkoZalogo.js.map +1 -1
- package/dist/index.js +60 -140
- package/dist/index.js.map +1 -1
- package/dist/izracunajNovoMaloprodajnoCeno.js +1 -5
- package/dist/izracunajNovoMaloprodajnoCeno.js.map +1 -1
- package/dist/karticaArtikla.d.ts +1 -1
- package/dist/karticaArtikla.d.ts.map +1 -1
- package/dist/karticaArtikla.js +11 -15
- package/dist/karticaArtikla.js.map +1 -1
- package/dist/koledar.js +7 -11
- package/dist/koledar.js.map +1 -1
- package/dist/lahkoImaZalogo.js +1 -5
- package/dist/lahkoImaZalogo.js.map +1 -1
- package/dist/maint/nastaviNbcArtiklomIzMpc.js +5 -9
- package/dist/maint/nastaviNbcArtiklomIzMpc.js.map +1 -1
- package/dist/maint/poknjiziVsoZgodovino.d.ts +1 -1
- package/dist/maint/poknjiziVsoZgodovino.d.ts.map +1 -1
- package/dist/maint/poknjiziVsoZgodovino.js +20 -28
- package/dist/maint/poknjiziVsoZgodovino.js.map +1 -1
- package/dist/maint/popraviNabaveCeneNaRacunih.js +7 -13
- package/dist/maint/popraviNabaveCeneNaRacunih.js.map +1 -1
- package/dist/maint/popraviNabavneCeneNaInventurah.js +11 -15
- package/dist/maint/popraviNabavneCeneNaInventurah.js.map +1 -1
- package/dist/models/Serijske.js +1 -2
- package/dist/models/Serijske.js.map +1 -1
- package/dist/models/SmsOddaja.js +1 -2
- package/dist/neuporabljeno.js +5 -10
- package/dist/neuporabljeno.js.map +1 -1
- package/dist/polnaInventura.js +16 -24
- package/dist/polnaInventura.js.map +1 -1
- package/dist/preracunajPostavkoBlagovnice.js +15 -23
- package/dist/preracunajPostavkoBlagovnice.js.map +1 -1
- package/dist/preracunajZalogo.js +5 -13
- package/dist/preracunajZalogo.js.map +1 -1
- package/dist/prisotnostOsebe.js +1 -2
- package/dist/q-blagovnice.js +6 -13
- package/dist/q-blagovnice.js.map +1 -1
- package/dist/q-isciPoObravnavah.js +11 -19
- package/dist/q-isciPoObravnavah.js.map +1 -1
- package/dist/q-isciPoRacunih.d.ts +1 -1
- package/dist/q-isciPoRacunih.d.ts.map +1 -1
- package/dist/q-isciPoRacunih.js +11 -19
- package/dist/q-isciPoRacunih.js.map +1 -1
- package/dist/q-mojPromet.js +8 -12
- package/dist/q-mojPromet.js.map +1 -1
- package/dist/q-porabaZdravil.js +13 -20
- package/dist/q-porabaZdravil.js.map +1 -1
- package/dist/q-prodano.js +8 -12
- package/dist/q-prodano.js.map +1 -1
- package/dist/q-prodanoPorabljeno.d.ts +1 -1
- package/dist/q-prodanoPorabljeno.d.ts.map +1 -1
- package/dist/q-prodanoPorabljeno.js +5 -9
- package/dist/q-prodanoPorabljeno.js.map +1 -1
- package/dist/q-promet.d.ts +3 -3
- package/dist/q-promet.d.ts.map +1 -1
- package/dist/q-promet.js +10 -17
- package/dist/q-promet.js.map +1 -1
- package/dist/q-racunovodji.js +17 -29
- package/dist/q-racunovodji.js.map +1 -1
- package/dist/q-skupineIzdelkov.js +8 -11
- package/dist/q-skupineIzdelkov.js.map +1 -1
- package/dist/q-skupineStrank.js +8 -11
- package/dist/q-skupineStrank.js.map +1 -1
- package/dist/q-strankeKlasificiraj.d.ts +1 -1
- package/dist/q-strankeKlasificiraj.d.ts.map +1 -1
- package/dist/q-strankeKlasificiraj.js +6 -12
- package/dist/q-strankeKlasificiraj.js.map +1 -1
- package/dist/q-strankeZadnjiObiski.js +5 -10
- package/dist/q-strankeZadnjiObiski.js.map +1 -1
- package/dist/q-zakljucek-blagajne.js +9 -15
- package/dist/q-zakljucek-blagajne.js.map +1 -1
- package/dist/razknjiziBlagovnico.js +5 -9
- package/dist/razknjiziBlagovnico.js.map +1 -1
- package/dist/razknjiziDobavnico.js +3 -7
- package/dist/razknjiziDobavnico.js.map +1 -1
- package/dist/razpisiDatum.js +2 -7
- package/dist/razpisiDatum.js.map +1 -1
- package/dist/round.js +1 -5
- package/dist/round.js.map +1 -1
- package/dist/serije.js +9 -19
- package/dist/serije.js.map +1 -1
- package/dist/smsCepljen.js +5 -9
- package/dist/smsCepljen.js.map +1 -1
- package/dist/smsCepljenjaNaDan.js +10 -17
- package/dist/smsCepljenjaNaDan.js.map +1 -1
- package/dist/smsCepljenjeBesedilo.js +4 -8
- package/dist/smsCepljenjeBesedilo.js.map +1 -1
- package/dist/smsMenjave.js +5 -12
- package/dist/smsMenjave.js.map +1 -1
- package/dist/smsNarocen.js +5 -9
- package/dist/smsNarocen.js.map +1 -1
- package/dist/smsNarocenBesedilo.js +4 -8
- package/dist/smsNarocenBesedilo.js.map +1 -1
- package/dist/smsNaroceniNaDan.js +11 -18
- package/dist/smsNaroceniNaDan.js.map +1 -1
- package/dist/spremembaZalogeZaObdobje.js +16 -23
- package/dist/spremembaZalogeZaObdobje.js.map +1 -1
- package/dist/spremeniZalogo.js +27 -36
- package/dist/spremeniZalogo.js.map +1 -1
- package/dist/spremeniZalogoNaPodlagiRacuna.js +15 -19
- package/dist/spremeniZalogoNaPodlagiRacuna.js.map +1 -1
- package/dist/spremeniZalogoZaDobavo.js +25 -29
- package/dist/spremeniZalogoZaDobavo.js.map +1 -1
- package/dist/spremeniZalogoZaInventuro.js +19 -23
- package/dist/spremeniZalogoZaInventuro.js.map +1 -1
- package/dist/spremeniZalogoZaPorabo.js +10 -14
- package/dist/spremeniZalogoZaPorabo.js.map +1 -1
- package/dist/spremeniZalogoZaPrenos.js +15 -22
- package/dist/spremeniZalogoZaPrenos.js.map +1 -1
- package/dist/strankaInfo.js +4 -7
- package/dist/strankaInfo.js.map +1 -1
- package/dist/support/poisciSpremembeMpc.js +5 -12
- package/dist/support/poisciSpremembeMpc.js.map +1 -1
- package/dist/test/dvojne-dobave.js +6 -8
- package/dist/test/dvojne-dobave.js.map +1 -1
- package/dist/test/memdb.js +15 -17
- package/dist/test/memdb.js.map +1 -1
- package/dist/test/mesane-enote.js +8 -10
- package/dist/test/mesane-enote.js.map +1 -1
- package/dist/test/prestavitev.js +18 -20
- package/dist/test/prestavitev.js.map +1 -1
- package/dist/test/serijske.js +36 -38
- package/dist/test/serijske.js.map +1 -1
- package/dist/test/sprememba-cene.js +25 -27
- package/dist/test/sprememba-cene.js.map +1 -1
- package/dist/test/sprememba-cene2.js +18 -20
- package/dist/test/sprememba-cene2.js.map +1 -1
- package/dist/test/sprememba-cene3.js +18 -20
- package/dist/test/sprememba-cene3.js.map +1 -1
- package/dist/test/sprememba-cene4.js +14 -16
- package/dist/test/sprememba-cene4.js.map +1 -1
- package/dist/test/sprememba-cene5.js +14 -16
- package/dist/test/sprememba-cene5.js.map +1 -1
- package/dist/test/sprememba-cene6.js +22 -24
- package/dist/test/sprememba-cene6.js.map +1 -1
- package/dist/test/tuja-zaloga.js +19 -21
- package/dist/test/tuja-zaloga.js.map +1 -1
- package/dist/test/zaloge.js +54 -56
- package/dist/test/zaloge.js.map +1 -1
- package/dist/test/zaloge2.js +21 -23
- package/dist/test/zaloge2.js.map +1 -1
- package/dist/types/CommandForDevice.js +1 -2
- package/dist/types/Dobavnica.js +1 -2
- package/dist/types/GlavaDokumenta.js +1 -2
- package/dist/types/Obvestilo.js +1 -2
- package/dist/types/SpecifikacijaNeuporabljenega.js +1 -2
- package/dist/types/SpecifikacijaPolneInventure.js +1 -2
- package/dist/types/SpremembaCene.js +1 -2
- package/dist/types/VrstaRazknjizbeZdravila.js +1 -2
- package/dist/types/VrstaSpremembeZaloge.js +1 -2
- package/dist/types/VrsteDokumentov.js +1 -2
- package/dist/types/VrsteDokumentov.js.map +1 -1
- package/dist/types/ZalogaDbAccessor.d.ts +1 -1
- package/dist/types/ZalogaDbAccessor.d.ts.map +1 -1
- package/dist/types/ZalogaDbAccessor.js +1 -2
- package/dist/types/artikel.js +5 -13
- package/dist/types/artikel.js.map +1 -1
- package/dist/types/blagajna.js +1 -2
- package/dist/types/blagovnica.js +1 -2
- package/dist/types/cepljenje.js +1 -2
- package/dist/types/diagnoza.js +1 -2
- package/dist/types/enota.js +2 -5
- package/dist/types/enota.js.map +1 -1
- package/dist/types/karence.js +1 -2
- package/dist/types/lokacija.js +1 -2
- package/dist/types/nalepka.js +1 -2
- package/dist/types/naprava.js +1 -2
- package/dist/types/narocen.js +1 -2
- package/dist/types/naslov.js +1 -2
- package/dist/types/nastavitve.d.ts +1 -1
- package/dist/types/nastavitve.d.ts.map +1 -1
- package/dist/types/nastavitve.js +1 -2
- package/dist/types/obravnava.js +2 -5
- package/dist/types/obravnava.js.map +1 -1
- package/dist/types/pacient.js +1 -2
- package/dist/types/partnerji.js +1 -2
- package/dist/types/partnerji.js.map +1 -1
- package/dist/types/pasma.js +1 -2
- package/dist/types/podpis.js +1 -2
- package/dist/types/poslovalnica.js +1 -2
- package/dist/types/protokol.js +1 -2
- package/dist/types/racun.js +1 -2
- package/dist/types/shared.js +1 -2
- package/dist/types/skladisce.js +1 -2
- package/dist/types/stranka.js +1 -2
- package/dist/types/uporabnik.js +1 -2
- package/dist/types/vrsta.js +1 -2
- package/dist/types/vrstaObravnave.js +1 -2
- package/dist/types/zaloga.js +1 -2
- package/dist/vrsteDokumentov.js +5 -8
- package/dist/vrsteDokumentov.js.map +1 -1
- package/dist/vsotaDobavZaObdobje.js +8 -15
- package/dist/vsotaDobavZaObdobje.js.map +1 -1
- package/dist/zakljuciBlagovnico.js +6 -10
- package/dist/zakljuciBlagovnico.js.map +1 -1
- package/dist/zalogaDbAccessorInMem.d.ts +1 -1
- package/dist/zalogaDbAccessorInMem.d.ts.map +1 -1
- package/dist/zalogaDbAccessorInMem.js +9 -15
- package/dist/zalogaDbAccessorInMem.js.map +1 -1
- package/dist/zalogaNaDan.d.ts +1 -1
- package/dist/zalogaNaDan.d.ts.map +1 -1
- package/dist/zalogaNaDan.js +8 -15
- package/dist/zalogaNaDan.js.map +1 -1
- package/dist/zalogaNaDanIzracunana.js +8 -15
- package/dist/zalogaNaDanIzracunana.js.map +1 -1
- package/dist/zalogaPoDnevih.js +7 -14
- package/dist/zalogaPoDnevih.js.map +1 -1
- package/dist/zapisiZalogoPoDnevih.js +8 -15
- package/dist/zapisiZalogoPoDnevih.js.map +1 -1
- package/dist/zbrisiZalogoArtiklovKiJeNeMorejoImeti.js +6 -10
- package/dist/zbrisiZalogoArtiklovKiJeNeMorejoImeti.js.map +1 -1
- package/dist/zeleniPribitek.js +1 -5
- package/dist/zeleniPribitek.js.map +1 -1
- package/package.json +5 -4
- package/tsconfig.tsbuildinfo +1 -1
@@ -1,13 +1,10 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
const spremeniZalogo_js_1 = require("./spremeniZalogo.js");
|
9
|
-
const serije_js_1 = require("./serije.js");
|
10
|
-
async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
1
|
+
import { ObjectID } from './ObjectId.js';
|
2
|
+
import { preracunajPorabo, vpisiSprememboZaloge } from "./preracunajZalogo.js";
|
3
|
+
import { jeIzdelek } from "./types/artikel.js";
|
4
|
+
import { razpisiDatum } from './razpisiDatum.js';
|
5
|
+
import { poisciInPreusmeriArtikel } from './spremeniZalogo.js';
|
6
|
+
import { odstraniSerijskeStevilke } from './serije.js';
|
7
|
+
export async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
11
8
|
if (!racun || racun.razknjizen)
|
12
9
|
return;
|
13
10
|
let vrstaDogodka = "prodaja";
|
@@ -42,32 +39,32 @@ async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
42
39
|
});
|
43
40
|
if (["storitev", "potrošni material"].includes(postavka.kategorija))
|
44
41
|
continue;
|
45
|
-
let { artikel, faktorRazknjizbe } = await
|
42
|
+
let { artikel, faktorRazknjizbe } = await poisciInPreusmeriArtikel(postavka.artikel_id, 1, mongo, `ni artikla za razknjižbo prodaje: ${postavka.artikel_id} - ${postavka.opis}`);
|
46
43
|
if (!artikel)
|
47
44
|
continue;
|
48
45
|
let z = await mongo.findOne("zaloga", { skladisce_id: racun.skladisce_id, artikel_id: artikel._id });
|
49
|
-
let zaloga = z || { _id: new
|
50
|
-
let razknjiziZalogo =
|
46
|
+
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: racun.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
47
|
+
let razknjiziZalogo = jeIzdelek(artikel)
|
51
48
|
|| artikel.zalogoRazknjizi === "ob prodaji"
|
52
49
|
|| (!artikel.zalogoRazknjizi && nastavitve.razknjizbaZdravil === "ob prodaji");
|
53
50
|
if (!razknjiziZalogo)
|
54
51
|
continue;
|
55
52
|
let stara_nbc = artikel.nbc || 0;
|
56
|
-
let sprememba =
|
53
|
+
let sprememba = preracunajPorabo({
|
57
54
|
vrstaSpremembe,
|
58
55
|
zaloga,
|
59
56
|
kolicina: postavka.kolicina * (faktorRazknjizbe || 1),
|
60
57
|
stara_nbc,
|
61
58
|
});
|
62
|
-
zaloga =
|
59
|
+
zaloga = vpisiSprememboZaloge(zaloga, sprememba);
|
63
60
|
await mongo.upsert("zaloga", { artikel_id: artikel._id, skladisce_id: racun.skladisce_id }, {
|
64
61
|
zaloga: zaloga.zaloga,
|
65
62
|
vrednost: zaloga.vrednost,
|
66
63
|
});
|
67
64
|
await mongo.insert("spremembaZaloge", {
|
68
|
-
_id: new
|
65
|
+
_id: new ObjectID().toHexString(),
|
69
66
|
datum: racun.datum,
|
70
|
-
...
|
67
|
+
...razpisiDatum(racun.datum),
|
71
68
|
artikel_id: artikel._id,
|
72
69
|
skladisce_id: zaloga.skladisce_id,
|
73
70
|
kategorija: artikel.kategorija,
|
@@ -82,7 +79,7 @@ async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
82
79
|
});
|
83
80
|
try {
|
84
81
|
if (nastavitve.spremljamoSerijske) {
|
85
|
-
let vpisane = await
|
82
|
+
let vpisane = await odstraniSerijskeStevilke({
|
86
83
|
artikel_id: postavka.artikel_id,
|
87
84
|
skladisce_id: racun.skladisce_id,
|
88
85
|
serijske: postavka.stevilkaZdravila || "",
|
@@ -114,5 +111,4 @@ async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
114
111
|
//await mongo.abortTransaction();
|
115
112
|
}
|
116
113
|
}
|
117
|
-
exports.spremeniZalogoNaPodlagiRacuna = spremeniZalogoNaPodlagiRacuna;
|
118
114
|
//# sourceMappingURL=spremeniZalogoNaPodlagiRacuna.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"spremeniZalogoNaPodlagiRacuna.js","sourceRoot":"","sources":["../src/spremeniZalogoNaPodlagiRacuna.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"spremeniZalogoNaPodlagiRacuna.js","sourceRoot":"","sources":["../src/spremeniZalogoNaPodlagiRacuna.ts"],"names":[],"mappings":"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"}
|
@@ -1,18 +1,15 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
const zeleniPribitek_js_1 = require("./zeleniPribitek.js");
|
12
|
-
const serije_js_1 = require("./serije.js");
|
13
|
-
async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
1
|
+
import { Repo } from 'cry-db';
|
2
|
+
import { ObjectID } from './ObjectId.js';
|
3
|
+
import { izracunajNovoMaloprodajnoCeno } from './izracunajNovoMaloprodajnoCeno.js';
|
4
|
+
import { preracunajNabavo, vpisiSprememboZalogePoNabavi } from "./preracunajZalogo.js";
|
5
|
+
import { izracunajSestevkeBlagovniceRazenDobave, preracunajPostavkoDobave } from './preracunajPostavkoBlagovnice.js';
|
6
|
+
import { razpisiDatum } from './razpisiDatum.js';
|
7
|
+
import { lahkoImaZalogo } from './lahkoImaZalogo.js';
|
8
|
+
import { zeleniPribitek } from './zeleniPribitek.js';
|
9
|
+
import { dodajSerijskeStevilke } from './serije.js';
|
10
|
+
export async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
14
11
|
let avtomatskaRazknjizba = {
|
15
|
-
_id:
|
12
|
+
_id: Repo.newid().toHexString(),
|
16
13
|
opis: `samodejna poraba za dobavo ${blagovnica.zapSt}`,
|
17
14
|
predhodnja_id: blagovnica._id,
|
18
15
|
datum: new Date(),
|
@@ -57,28 +54,28 @@ async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
|
57
54
|
continue;
|
58
55
|
}
|
59
56
|
let z = await mongo.findOne("zaloga", { skladisce_id: blagovnica.skladisce_id, artikel_id: postavka.artikel_id });
|
60
|
-
let zaloga = z || { _id: new
|
57
|
+
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
61
58
|
if (!postavka.enotaFaktor)
|
62
59
|
throw new Error("postavka dobave mora vsebovati polje enotaFaktor");
|
63
60
|
const faktorEnote = postavka.enotaFaktor || 1;
|
64
61
|
const kolicina = postavka.kolicina * faktorEnote;
|
65
62
|
const stara_nbc = artikel.nbc || 0;
|
66
63
|
const zadnja_nbc = artikel.zadnjaNbc || stara_nbc;
|
67
|
-
const sprememba =
|
64
|
+
const sprememba = preracunajNabavo({
|
68
65
|
vrstaSpremembe: 1 /* VrstaSpremembeZaloge.NABAVA */,
|
69
66
|
zaloga,
|
70
67
|
kolicina: kolicina,
|
71
68
|
stara_nbc,
|
72
69
|
nova_nbc: postavka.nbcN / faktorEnote,
|
73
70
|
});
|
74
|
-
zaloga =
|
75
|
-
let imaZalogo =
|
71
|
+
zaloga = vpisiSprememboZalogePoNabavi(zaloga, sprememba);
|
72
|
+
let imaZalogo = lahkoImaZalogo(artikel, nastavitve.razknjizbaZdravil, /*zaDobavo*/ true);
|
76
73
|
if (imaZalogo) {
|
77
74
|
await vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mongo, zaloga, sprememba, blagovnica, avtomatskaRazknjizba, postavka, kolicina, postavka.nbcN / faktorEnote, n++);
|
78
75
|
}
|
79
76
|
await spremeniMpcArtikla(artikel, postavka, nastavitve, sprememba, zadnja_nbc, stara_nbc, postavka.nbc0 / faktorEnote, blagovnica.datum, blagovnica.dobavitelj_id, mongo);
|
80
77
|
if (nastavitve.spremljamoSerijske && postavka.stevilkeZdravil) {
|
81
|
-
await
|
78
|
+
await dodajSerijskeStevilke({
|
82
79
|
artikel_id: postavka.artikel_id,
|
83
80
|
skladisce_id: blagovnica.skladisce_id,
|
84
81
|
vir: "dobava",
|
@@ -88,20 +85,19 @@ async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
|
88
85
|
serijske: postavka.stevilkeZdravil,
|
89
86
|
}, mongo);
|
90
87
|
}
|
91
|
-
|
88
|
+
preracunajPostavkoDobave(postavka);
|
92
89
|
}
|
93
90
|
if (avtomatskaRazknjizba.postavke.length) {
|
94
|
-
let ss =
|
91
|
+
let ss = izracunajSestevkeBlagovniceRazenDobave(avtomatskaRazknjizba.postavke);
|
95
92
|
avtomatskaRazknjizba.razknjizena = new Date();
|
96
93
|
avtomatskaRazknjizba.status = "zaključena";
|
97
94
|
avtomatskaRazknjizba.dav = ss.dav;
|
98
95
|
avtomatskaRazknjizba.nbc = ss.nbc;
|
99
|
-
|
96
|
+
razpisiDatum(avtomatskaRazknjizba.datum, avtomatskaRazknjizba);
|
100
97
|
await mongo.upsert("blagovnice", { _id: avtomatskaRazknjizba._id }, avtomatskaRazknjizba);
|
101
98
|
}
|
102
99
|
return false;
|
103
100
|
}
|
104
|
-
exports.spremeniZalogoZaDobavo = spremeniZalogoZaDobavo;
|
105
101
|
async function vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mongo, zaloga, sprememba, blagovnica, avtomatskaRazknjizba, postavka, kolicina, nova_nbc, n) {
|
106
102
|
const razknjizimoTakoj = (artikel.kategorija === "zdravilo"
|
107
103
|
&& razknjizujObDobavi
|
@@ -123,9 +119,9 @@ async function vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mon
|
|
123
119
|
});
|
124
120
|
}
|
125
121
|
await mongo.insert("spremembaZaloge", {
|
126
|
-
_id: new
|
122
|
+
_id: new ObjectID().toHexString(),
|
127
123
|
datum: new Date(blagovnica.datum.valueOf() + n),
|
128
|
-
...
|
124
|
+
...razpisiDatum(blagovnica.datum),
|
129
125
|
artikel_id: artikel._id,
|
130
126
|
skladisce_id: zaloga.skladisce_id,
|
131
127
|
dokument_id: blagovnica._id,
|
@@ -140,9 +136,9 @@ async function vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mon
|
|
140
136
|
});
|
141
137
|
if (razknjizimoTakoj) {
|
142
138
|
await mongo.insert("spremembaZaloge", {
|
143
|
-
_id: new
|
139
|
+
_id: new ObjectID().toHexString(),
|
144
140
|
datum: blagovnica.datum,
|
145
|
-
...
|
141
|
+
...razpisiDatum(blagovnica.datum),
|
146
142
|
artikel_id: artikel._id,
|
147
143
|
skladisce_id: zaloga.skladisce_id,
|
148
144
|
dokument_id: blagovnica._id,
|
@@ -177,7 +173,7 @@ async function spremeniMpcArtikla(artikel, postavka, nastavitve, sprememba, zadn
|
|
177
173
|
let razlog;
|
178
174
|
if (!postavka.mpcPreskoci) {
|
179
175
|
if (nastavitve.posodobiCeneObDobavi === "dobava") {
|
180
|
-
nova_mpc =
|
176
|
+
nova_mpc = izracunajNovoMaloprodajnoCeno(zadnja_nbc, nova_nbc, nastavitve, artikel);
|
181
177
|
razlog = "preračun";
|
182
178
|
}
|
183
179
|
if (postavka.mpcZakleni !== artikel.mpcLocked) {
|
@@ -185,7 +181,7 @@ async function spremeniMpcArtikla(artikel, postavka, nastavitve, sprememba, zadn
|
|
185
181
|
}
|
186
182
|
if (postavka.mpcNastavi) {
|
187
183
|
nova_mpc = Number(postavka.mpcNastavi.toFixed(nastavitve.zaokrozitevCen));
|
188
|
-
novi_pribitek =
|
184
|
+
novi_pribitek = zeleniPribitek({ mpc: nova_mpc, nbc: nova_nbc, dst: artikel.dst || 0 });
|
189
185
|
// postavka.mpcZakleni = true;
|
190
186
|
razlog = "nastavi mpc";
|
191
187
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaDobavo.js","sourceRoot":"","sources":["../src/spremeniZalogoZaDobavo.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"spremeniZalogoZaDobavo.js","sourceRoot":"","sources":["../src/spremeniZalogoZaDobavo.ts"],"names":[],"mappings":"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"}
|
@@ -1,14 +1,11 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
const lahkoImaZalogo_js_1 = require("./lahkoImaZalogo.js");
|
10
|
-
const serije_js_1 = require("./serije.js");
|
11
|
-
async function spremeniZalogoZaInventuro(blagovnica, privzetaRazknjizaZdravil, spremljamoSerijske, mongo) {
|
1
|
+
import { ObjectID } from './ObjectId.js';
|
2
|
+
import { preracunajInventuro, vpisiSprememboZaloge } from "./preracunajZalogo.js";
|
3
|
+
import { preracunajPostavkoBlagovniceRazenDobave } from './preracunajPostavkoBlagovnice.js';
|
4
|
+
import { razpisiDatum } from './razpisiDatum.js';
|
5
|
+
import { poisciArtikel } from './spremeniZalogo.js';
|
6
|
+
import { lahkoImaZalogo } from './lahkoImaZalogo.js';
|
7
|
+
import { dodajSerijskeStevilke, odstraniSerijskeStevilkeZaArtikel, strniSerijske } from './serije.js';
|
8
|
+
export async function spremeniZalogoZaInventuro(blagovnica, privzetaRazknjizaZdravil, spremljamoSerijske, mongo) {
|
12
9
|
for await (let postavka of blagovnica.postavke) {
|
13
10
|
if (["storitev", "potrošni material"].includes(postavka.kategorija))
|
14
11
|
continue;
|
@@ -27,36 +24,36 @@ async function spremeniZalogoZaInventuro(blagovnica, privzetaRazknjizaZdravil, s
|
|
27
24
|
continue;
|
28
25
|
}
|
29
26
|
;
|
30
|
-
let artikel = await
|
27
|
+
let artikel = await poisciArtikel(postavka.artikel_id, mongo, `ni artikla za inventuro: ${postavka.artikel_id} - ${postavka.naziv}`);
|
31
28
|
if (!artikel)
|
32
29
|
continue;
|
33
|
-
if (!
|
30
|
+
if (!lahkoImaZalogo(artikel, privzetaRazknjizaZdravil))
|
34
31
|
continue;
|
35
32
|
let z = await mongo.findOne("zaloga", { skladisce_id: blagovnica.skladisce_id, artikel_id: artikel._id });
|
36
|
-
let zaloga = z || { _id: new
|
33
|
+
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
37
34
|
let stara_nbc = artikel.nbc || 0;
|
38
35
|
if (postavka.popisanaKolicina === undefined) {
|
39
36
|
console.error(`popisanaKolicina manjka na inventuri ${blagovnica._id} za artikel ${artikel._id}`);
|
40
37
|
continue;
|
41
38
|
}
|
42
|
-
let sprememba =
|
39
|
+
let sprememba = preracunajInventuro({
|
43
40
|
vrstaSpremembe: 0 /* VrstaSpremembeZaloge.NASTAVI */,
|
44
41
|
zaloga,
|
45
42
|
kolicina: postavka.popisanaKolicina,
|
46
43
|
stara_nbc,
|
47
44
|
});
|
48
|
-
zaloga =
|
45
|
+
zaloga = vpisiSprememboZaloge(zaloga, sprememba);
|
49
46
|
await mongo.upsert("zaloga", { artikel_id: artikel._id, skladisce_id: zaloga.skladisce_id }, {
|
50
47
|
nbc: stara_nbc,
|
51
48
|
zaloga: sprememba.zaloga.nova,
|
52
49
|
vrednost: sprememba.vrednostZaloge.nova,
|
53
50
|
});
|
54
51
|
postavka.kolicina = sprememba.zaloga.sprememba;
|
55
|
-
|
52
|
+
preracunajPostavkoBlagovniceRazenDobave(postavka);
|
56
53
|
await mongo.insert("spremembaZaloge", {
|
57
|
-
_id: new
|
54
|
+
_id: new ObjectID().toHexString(),
|
58
55
|
datum: blagovnica.datum,
|
59
|
-
...
|
56
|
+
...razpisiDatum(blagovnica.datum),
|
60
57
|
artikel_id: artikel._id,
|
61
58
|
skladisce_id: zaloga.skladisce_id,
|
62
59
|
dokument_id: blagovnica._id,
|
@@ -77,18 +74,18 @@ async function spremeniZalogoZaInventuro(blagovnica, privzetaRazknjizaZdravil, s
|
|
77
74
|
uporabnik: blagovnica.izvedel,
|
78
75
|
dokument_id: blagovnica._id,
|
79
76
|
};
|
80
|
-
await
|
77
|
+
await odstraniSerijskeStevilkeZaArtikel({
|
81
78
|
...spec,
|
82
79
|
ostane: postavka.stevilkeZdravil?.length ? 0 : postavka.popisanaKolicina
|
83
80
|
}, mongo);
|
84
81
|
if (!!postavka.stevilkeZdravil?.length) {
|
85
|
-
let dodane = await
|
82
|
+
let dodane = await dodajSerijskeStevilke({
|
86
83
|
...spec,
|
87
84
|
serijske: postavka.stevilkeZdravil,
|
88
85
|
stevilo: postavka.popisanaKolicina,
|
89
86
|
}, mongo);
|
90
87
|
postavka.vtipkaneStevilkeZdravil = postavka.stevilkeZdravil;
|
91
|
-
postavka.stevilkeZdravil =
|
88
|
+
postavka.stevilkeZdravil = strniSerijske(dodane.map(a => a.serijska));
|
92
89
|
}
|
93
90
|
}
|
94
91
|
await mongo.upsert("artikli", { _id: artikel._id, }, { zadnjaInventura: blagovnica.datum });
|
@@ -99,5 +96,4 @@ async function spremeniZalogoZaInventuro(blagovnica, privzetaRazknjizaZdravil, s
|
|
99
96
|
});
|
100
97
|
return false;
|
101
98
|
}
|
102
|
-
exports.spremeniZalogoZaInventuro = spremeniZalogoZaInventuro;
|
103
99
|
//# sourceMappingURL=spremeniZalogoZaInventuro.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaInventuro.js","sourceRoot":"","sources":["../src/spremeniZalogoZaInventuro.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"spremeniZalogoZaInventuro.js","sourceRoot":"","sources":["../src/spremeniZalogoZaInventuro.ts"],"names":[],"mappings":"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"}
|
@@ -1,11 +1,8 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
const lahkoImaZalogo_js_1 = require("./lahkoImaZalogo.js");
|
7
|
-
const serije_js_1 = require("./serije.js");
|
8
|
-
async function spremeniZalogoZaPorabo(blagovnica, privzetaRazknjizaZdravil, spremljamoSerijske, mongo) {
|
1
|
+
import { ObjectID } from './ObjectId.js';
|
2
|
+
import { poisciArtikel, _poknjiziPoraboZaloge } from './spremeniZalogo.js';
|
3
|
+
import { lahkoImaZalogo } from './lahkoImaZalogo.js';
|
4
|
+
import { odstraniSerijskeStevilke } from './serije.js';
|
5
|
+
export async function spremeniZalogoZaPorabo(blagovnica, privzetaRazknjizaZdravil, spremljamoSerijske, mongo) {
|
9
6
|
let vpisaliSmoSerijske = false;
|
10
7
|
for await (let postavka of blagovnica.postavke) {
|
11
8
|
if (["storitev", "potrošni material"].includes(postavka.kategorija))
|
@@ -25,22 +22,22 @@ async function spremeniZalogoZaPorabo(blagovnica, privzetaRazknjizaZdravil, spre
|
|
25
22
|
continue;
|
26
23
|
}
|
27
24
|
;
|
28
|
-
let artikel = await
|
25
|
+
let artikel = await poisciArtikel(postavka.artikel_id, mongo, `ni artikla za porabo: ${postavka.artikel_id} - ${postavka.naziv || postavka.opis}`);
|
29
26
|
if (!artikel)
|
30
27
|
continue;
|
31
|
-
if (!
|
28
|
+
if (!lahkoImaZalogo(artikel, privzetaRazknjizaZdravil))
|
32
29
|
continue;
|
33
30
|
let z = await mongo.findOne("zaloga", { skladisce_id: blagovnica.skladisce_id, artikel_id: artikel._id });
|
34
|
-
let zaloga = z || { _id: new
|
31
|
+
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
35
32
|
let vrsta = blagovnica.vrsta || "dobavnica";
|
36
33
|
let stara_nbc = artikel.nbc || 0;
|
37
|
-
await
|
34
|
+
await _poknjiziPoraboZaloge(zaloga, vrsta, postavka, stara_nbc, mongo, artikel, {
|
38
35
|
vrsta: vrsta,
|
39
36
|
_id: blagovnica._id,
|
40
37
|
datum: blagovnica.datum
|
41
38
|
});
|
42
39
|
if (spremljamoSerijske) {
|
43
|
-
let ret = await
|
40
|
+
let ret = await odstraniSerijskeStevilke({
|
44
41
|
artikel_id: postavka.artikel_id,
|
45
42
|
skladisce_id: blagovnica.skladisce_id,
|
46
43
|
serijske: postavka.stevilkeZdravil || postavka.stevilkaZdravila?.split(",")?.map(a => a?.trim())?.filter(a => !!a) || [],
|
@@ -60,5 +57,4 @@ async function spremeniZalogoZaPorabo(blagovnica, privzetaRazknjizaZdravil, spre
|
|
60
57
|
}
|
61
58
|
return vpisaliSmoSerijske;
|
62
59
|
}
|
63
|
-
exports.spremeniZalogoZaPorabo = spremeniZalogoZaPorabo;
|
64
60
|
//# sourceMappingURL=spremeniZalogoZaPorabo.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaPorabo.js","sourceRoot":"","sources":["../src/spremeniZalogoZaPorabo.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"spremeniZalogoZaPorabo.js","sourceRoot":"","sources":["../src/spremeniZalogoZaPorabo.ts"],"names":[],"mappings":"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"}
|
@@ -1,23 +1,17 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
};
|
5
|
-
|
6
|
-
|
7
|
-
const lodash_clonedeep_1 = __importDefault(require("lodash.clonedeep"));
|
8
|
-
const ObjectId_js_1 = require("./ObjectId.js");
|
9
|
-
const spremeniZalogo_js_1 = require("./spremeniZalogo.js");
|
10
|
-
const lahkoImaZalogo_js_1 = require("./lahkoImaZalogo.js");
|
11
|
-
const serije_js_1 = require("./serije.js");
|
12
|
-
async function spremeniZalogoZaPrenos(blagovnica, privzetaRazknjizaZdravil, spremljamoSerijske, mongo) {
|
1
|
+
import cloneDeep from 'lodash.clonedeep';
|
2
|
+
import { ObjectID } from './ObjectId.js';
|
3
|
+
import { poisciArtikel, _poknjiziPoraboZaloge } from './spremeniZalogo.js';
|
4
|
+
import { lahkoImaZalogo } from './lahkoImaZalogo.js';
|
5
|
+
import { prestaviSerijskeStevilkeMedSkladisci } from './serije.js';
|
6
|
+
export async function spremeniZalogoZaPrenos(blagovnica, privzetaRazknjizaZdravil, spremljamoSerijske, mongo) {
|
13
7
|
// pri prenosu: vhodno blagovnico spremenimo v "iznos",
|
14
8
|
// nato naredimo podvojeno blagovnico "vnos"
|
15
9
|
let iznos = blagovnica;
|
16
10
|
iznos.vrsta = "iznos";
|
17
11
|
iznos.skladisce_id = blagovnica.iz_skladisca_id;
|
18
12
|
iznos.lokacija_id = blagovnica.z_lokacije_id;
|
19
|
-
let vnos = (
|
20
|
-
vnos._id = new
|
13
|
+
let vnos = cloneDeep(blagovnica);
|
14
|
+
vnos._id = new ObjectID().toHexString();
|
21
15
|
vnos.zapSt = "SEQ_NEXT";
|
22
16
|
vnos.vrsta = "vnos";
|
23
17
|
vnos.razknjizena = new Date();
|
@@ -61,20 +55,20 @@ async function spremeniZalogoZaPrenos(blagovnica, privzetaRazknjizaZdravil, spre
|
|
61
55
|
});
|
62
56
|
continue;
|
63
57
|
}
|
64
|
-
let artikel = await
|
58
|
+
let artikel = await poisciArtikel(postavka.artikel_id, mongo, `ni artikla za prenos: ${postavka.artikel_id} - ${postavka.naziv}`);
|
65
59
|
if (!artikel)
|
66
60
|
continue;
|
67
|
-
if (!
|
61
|
+
if (!lahkoImaZalogo(artikel, privzetaRazknjizaZdravil))
|
68
62
|
continue;
|
69
63
|
let iz_zaloge = await mongo.findOne("zaloga", { skladisce_id: blagovnica.iz_skladisca_id, artikel_id: artikel._id, });
|
70
|
-
iz_zaloge = iz_zaloge || { _id: new
|
64
|
+
iz_zaloge = iz_zaloge || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.iz_skladisca_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
71
65
|
let na_zalogo = await mongo.findOne("zaloga", { skladisce_id: blagovnica.v_skladisce_id, artikel_id: artikel._id, });
|
72
|
-
na_zalogo = na_zalogo || { _id: new
|
66
|
+
na_zalogo = na_zalogo || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.v_skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
73
67
|
let stara_nbc = artikel.nbc || 0;
|
74
|
-
await
|
75
|
-
await
|
68
|
+
await _poknjiziPoraboZaloge(iz_zaloge, "iznos", postavka, stara_nbc, mongo, artikel, iznos);
|
69
|
+
await _poknjiziPoraboZaloge(na_zalogo, "vnos", postavka, stara_nbc, mongo, artikel, vnos);
|
76
70
|
if (spremljamoSerijske && postavka.stevilkeZdravil) {
|
77
|
-
let vpisane = await
|
71
|
+
let vpisane = await prestaviSerijskeStevilkeMedSkladisci({
|
78
72
|
artikel_id: postavka.artikel_id,
|
79
73
|
iz_skladisca_id: blagovnica.iz_skladisca_id,
|
80
74
|
v_skladisce_id: blagovnica.v_skladisce_id,
|
@@ -93,5 +87,4 @@ async function spremeniZalogoZaPrenos(blagovnica, privzetaRazknjizaZdravil, spre
|
|
93
87
|
}
|
94
88
|
return vpisaliSmoSerijske;
|
95
89
|
}
|
96
|
-
exports.spremeniZalogoZaPrenos = spremeniZalogoZaPrenos;
|
97
90
|
//# sourceMappingURL=spremeniZalogoZaPrenos.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"spremeniZalogoZaPrenos.js","sourceRoot":"","sources":["../src/spremeniZalogoZaPrenos.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"spremeniZalogoZaPrenos.js","sourceRoot":"","sources":["../src/spremeniZalogoZaPrenos.ts"],"names":[],"mappings":"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"}
|
package/dist/strankaInfo.js
CHANGED
@@ -1,22 +1,19 @@
|
|
1
|
-
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const cry_db_1 = require("cry-db");
|
1
|
+
import { Base, Mongo } from "cry-db";
|
4
2
|
/**
|
5
3
|
* Vrne podatke o stranki, vključno z zadnjimi obiski.
|
6
4
|
*/
|
7
|
-
async function strankaInfo(tenant, _id) {
|
8
|
-
let db = new
|
5
|
+
export default async function strankaInfo(tenant, _id) {
|
6
|
+
let db = new Mongo(tenant);
|
9
7
|
let stranka = await db.findById('stranke', _id);
|
10
8
|
if (!stranka)
|
11
9
|
return null;
|
12
|
-
let racuni = (await db.find('racuni', { "stranka._id":
|
10
|
+
let racuni = (await db.find('racuni', { "stranka._id": Base.objectid(_id) }, { sort: { _id: -1 } }));
|
13
11
|
await db.close();
|
14
12
|
return {
|
15
13
|
stranka,
|
16
14
|
racuni,
|
17
15
|
};
|
18
16
|
}
|
19
|
-
exports.default = strankaInfo;
|
20
17
|
// (async function () {
|
21
18
|
// let res = await strankaInfo("vet","5f8fb8d8aec9a98a06b261c2")
|
22
19
|
// console.log('res',res);
|
package/dist/strankaInfo.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"strankaInfo.js","sourceRoot":"","sources":["../src/strankaInfo.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"strankaInfo.js","sourceRoot":"","sources":["../src/strankaInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAKpC;;GAEG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CAAC,MAAa,EAAE,GAAO;IAE5D,IAAI,EAAE,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAA;IAE1B,IAAI,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAmB,CAAC;IAClE,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,IAAI,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CAAQ,QAAQ,EAAC,EAAE,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAS,EAAC,EAAE,IAAI,EAAC,EAAC,GAAG,EAAC,CAAC,CAAC,EAAC,EAAC,CAAC,CAAY,CAAC;IAEvH,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;IAEjB,OAAO;QACH,OAAO;QACP,MAAM;KACT,CAAA;AACL,CAAC;AAED,uBAAuB;AACvB,oEAAoE;AACpE,8BAA8B;AAC9B,QAAQ"}
|