cry-klikvet-logic 0.10.136 → 0.10.138
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/calcTimeQuery.js +3 -7
- package/dist/calcTimeQuery.js.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.d.ts +1 -1
- package/dist/idjiArtiklovKiImajoLahkoZalogo.d.ts.map +1 -1
- package/dist/idjiArtiklovKiImajoLahkoZalogo.js +5 -9
- package/dist/idjiArtiklovKiImajoLahkoZalogo.js.map +1 -1
- package/dist/index.d.ts +6 -11
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +60 -139
- package/dist/index.js.map +1 -1
- package/dist/izracunajNovoMaloprodajnoCeno.d.ts +1 -1
- package/dist/izracunajNovoMaloprodajnoCeno.d.ts.map +1 -1
- package/dist/izracunajNovoMaloprodajnoCeno.js +1 -5
- package/dist/izracunajNovoMaloprodajnoCeno.js.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.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.d.ts +0 -1
- package/dist/neuporabljeno.d.ts.map +1 -1
- 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.d.ts +2 -2
- package/dist/preracunajZalogo.js +14 -21
- 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 +9 -17
- package/dist/q-isciPoObravnavah.js.map +1 -1
- package/dist/q-isciPoRacunih.d.ts +0 -1
- package/dist/q-isciPoRacunih.d.ts.map +1 -1
- package/dist/q-isciPoRacunih.js +9 -17
- 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.js +5 -9
- package/dist/q-prodanoPorabljeno.js.map +1 -1
- package/dist/q-promet.d.ts +2 -2
- package/dist/q-promet.js +8 -15
- package/dist/q-promet.js.map +1 -1
- package/dist/q-racunovodji.d.ts +0 -1
- package/dist/q-racunovodji.d.ts.map +1 -1
- package/dist/q-racunovodji.js +18 -30
- 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 +6 -9
- 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.d.ts +1 -1
- package/dist/razknjiziBlagovnico.d.ts.map +1 -1
- package/dist/razknjiziBlagovnico.js +5 -9
- package/dist/razknjiziBlagovnico.js.map +1 -1
- package/dist/razknjiziDobavnico.d.ts +1 -2
- package/dist/razknjiziDobavnico.d.ts.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.d.ts +1 -3
- package/dist/serije.d.ts.map +1 -1
- package/dist/serije.js +9 -19
- package/dist/serije.js.map +1 -1
- package/dist/smsCepljen.d.ts +1 -12
- package/dist/smsCepljen.d.ts.map +1 -1
- package/dist/smsCepljen.js +5 -9
- package/dist/smsCepljen.js.map +1 -1
- package/dist/smsCepljenjaNaDan.d.ts +1 -12
- package/dist/smsCepljenjaNaDan.d.ts.map +1 -1
- package/dist/smsCepljenjaNaDan.js +10 -17
- package/dist/smsCepljenjaNaDan.js.map +1 -1
- package/dist/smsCepljenjeBesedilo.d.ts +5 -5
- 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.d.ts +1 -12
- package/dist/smsNarocen.d.ts.map +1 -1
- package/dist/smsNarocen.js +5 -9
- package/dist/smsNarocen.js.map +1 -1
- package/dist/smsNarocenBesedilo.d.ts +5 -5
- package/dist/smsNarocenBesedilo.js +4 -8
- package/dist/smsNarocenBesedilo.js.map +1 -1
- package/dist/smsNaroceniNaDan.d.ts +1 -11
- package/dist/smsNaroceniNaDan.d.ts.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 +29 -40
- package/dist/spremeniZalogo.js.map +1 -1
- package/dist/spremeniZalogoNaPodlagiRacuna.js +17 -23
- package/dist/spremeniZalogoNaPodlagiRacuna.js.map +1 -1
- package/dist/spremeniZalogoZaDobavo.js +28 -34
- package/dist/spremeniZalogoZaDobavo.js.map +1 -1
- package/dist/spremeniZalogoZaInventuro.js +22 -28
- package/dist/spremeniZalogoZaInventuro.js.map +1 -1
- package/dist/spremeniZalogoZaPorabo.js +10 -17
- package/dist/spremeniZalogoZaPorabo.js.map +1 -1
- package/dist/spremeniZalogoZaPrenos.js +15 -22
- package/dist/spremeniZalogoZaPrenos.js.map +1 -1
- package/dist/strankaInfo.d.ts +1 -3
- package/dist/strankaInfo.d.ts.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 +60 -61
- 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.js +1 -2
- package/dist/types/artikel.js +5 -13
- package/dist/types/artikel.js.map +1 -1
- package/dist/types/blagajna.d.ts +1 -0
- package/dist/types/blagajna.d.ts.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.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.d.ts +3 -0
- package/dist/types/racun.d.ts.map +1 -1
- 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.d.ts +1 -1
- package/dist/vsotaDobavZaObdobje.d.ts.map +1 -1
- package/dist/vsotaDobavZaObdobje.js +8 -15
- package/dist/vsotaDobavZaObdobje.js.map +1 -1
- package/dist/zakljuciBlagovnico.d.ts +1 -2
- package/dist/zakljuciBlagovnico.d.ts.map +1 -1
- package/dist/zakljuciBlagovnico.js +6 -10
- package/dist/zakljuciBlagovnico.js.map +1 -1
- package/dist/zalogaDbAccessorInMem.js +9 -15
- package/dist/zalogaDbAccessorInMem.js.map +1 -1
- package/dist/zalogaNaDan.d.ts +0 -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 +2 -1
- package/tsconfig.tsbuildinfo +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"spremembaZalogeZaObdobje.js","sourceRoot":"","sources":["../src/spremembaZalogeZaObdobje.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"spremembaZalogeZaObdobje.js","sourceRoot":"","sources":["../src/spremembaZalogeZaObdobje.ts"],"names":[],"mappings":"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"}
|
package/dist/spremeniZalogo.js
CHANGED
@@ -1,17 +1,12 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
};
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
const spremeniZalogoZaPrenos_1 = require("./spremeniZalogoZaPrenos");
|
11
|
-
const spremeniZalogoZaDobavo_1 = require("./spremeniZalogoZaDobavo");
|
12
|
-
const spremeniZalogoZaInventuro_1 = require("./spremeniZalogoZaInventuro");
|
13
|
-
const spremeniZalogoZaPorabo_1 = require("./spremeniZalogoZaPorabo");
|
14
|
-
function knjiziPoEnotiNabave(vrsta) {
|
1
|
+
import ObjectID from 'bson-objectid';
|
2
|
+
import { preracunajPorabo, vpisiSprememboZaloge } from "./preracunajZalogo";
|
3
|
+
import { VrstaSpremembeZaloge } from "./types/VrstaSpremembeZaloge";
|
4
|
+
import { razpisiDatum } from './razpisiDatum';
|
5
|
+
import { spremeniZalogoZaPrenos } from './spremeniZalogoZaPrenos';
|
6
|
+
import { spremeniZalogoZaDobavo } from './spremeniZalogoZaDobavo';
|
7
|
+
import { spremeniZalogoZaInventuro } from './spremeniZalogoZaInventuro';
|
8
|
+
import { spremeniZalogoZaPorabo } from './spremeniZalogoZaPorabo';
|
9
|
+
export function knjiziPoEnotiNabave(vrsta) {
|
15
10
|
return [
|
16
11
|
"dobava",
|
17
12
|
"vračilo",
|
@@ -20,7 +15,6 @@ function knjiziPoEnotiNabave(vrsta) {
|
|
20
15
|
// "prenos",
|
21
16
|
].includes(vrsta);
|
22
17
|
}
|
23
|
-
exports.knjiziPoEnotiNabave = knjiziPoEnotiNabave;
|
24
18
|
// export function sestevki(postavke: (KolicinskaPostavkaBlagovnice & { nbc: number })[]): { nbc0: number, nbc: number, pop: number, dav: number, prc: number } {
|
25
19
|
// let d = { nbc0: 0, nbc: 0, pop: 0, dav: 0, prc: 0 }
|
26
20
|
// Object.values(postavke).forEach(p => {
|
@@ -31,7 +25,7 @@ exports.knjiziPoEnotiNabave = knjiziPoEnotiNabave;
|
|
31
25
|
// })
|
32
26
|
// return d
|
33
27
|
// }
|
34
|
-
async function poisciArtikel(_id, mongo, errorText) {
|
28
|
+
export async function poisciArtikel(_id, mongo, errorText) {
|
35
29
|
let artikel = await mongo.findOne("artikli", { _id });
|
36
30
|
if (!artikel) {
|
37
31
|
console.error(errorText);
|
@@ -41,8 +35,7 @@ async function poisciArtikel(_id, mongo, errorText) {
|
|
41
35
|
return null;
|
42
36
|
return artikel;
|
43
37
|
}
|
44
|
-
|
45
|
-
async function poisciInPreusmeriArtikel(_id, faktorRazknjizbe, mongo, errorText) {
|
38
|
+
export async function poisciInPreusmeriArtikel(_id, faktorRazknjizbe, mongo, errorText) {
|
46
39
|
let artikel = await mongo.findOne("artikli", { _id });
|
47
40
|
if (!artikel) {
|
48
41
|
console.error(errorText);
|
@@ -59,25 +52,24 @@ async function poisciInPreusmeriArtikel(_id, faktorRazknjizbe, mongo, errorText)
|
|
59
52
|
}
|
60
53
|
return { artikel, faktorRazknjizbe };
|
61
54
|
}
|
62
|
-
|
63
|
-
async function _poknjiziPoraboZaloge(zaloga, blagovniDogodek, postavka, stara_nbc, mongo, artikel, blagovnica) {
|
55
|
+
export async function _poknjiziPoraboZaloge(zaloga, blagovniDogodek, postavka, stara_nbc, mongo, artikel, blagovnica) {
|
64
56
|
let faktor = knjiziPoEnotiNabave(blagovnica.vrsta) ? (postavka.enotaFaktor || 1) : 1;
|
65
|
-
let sprememba =
|
66
|
-
vrstaSpremembe: blagovniDogodek === "vnos" ?
|
57
|
+
let sprememba = preracunajPorabo({
|
58
|
+
vrstaSpremembe: blagovniDogodek === "vnos" ? VrstaSpremembeZaloge.NABAVA : VrstaSpremembeZaloge.PORABA,
|
67
59
|
zaloga,
|
68
60
|
kolicina: postavka.kolicina * faktor,
|
69
61
|
stara_nbc,
|
70
62
|
});
|
71
|
-
zaloga =
|
63
|
+
zaloga = vpisiSprememboZaloge(zaloga, sprememba);
|
72
64
|
await mongo.upsert("zaloga", { artikel_id: artikel._id, skladisce_id: zaloga.skladisce_id }, {
|
73
65
|
nbc: stara_nbc,
|
74
66
|
zaloga: sprememba.zaloga.nova,
|
75
67
|
vrednost: sprememba.vrednostZaloge.nova,
|
76
68
|
});
|
77
69
|
await mongo.insert("spremembaZaloge", {
|
78
|
-
_id: new
|
70
|
+
_id: new ObjectID().toHexString(),
|
79
71
|
datum: blagovnica.datum,
|
80
|
-
...
|
72
|
+
...razpisiDatum(blagovnica.datum),
|
81
73
|
artikel_id: artikel._id,
|
82
74
|
skladisce_id: zaloga.skladisce_id,
|
83
75
|
dokument_id: blagovnica._id,
|
@@ -92,15 +84,13 @@ async function _poknjiziPoraboZaloge(zaloga, blagovniDogodek, postavka, stara_nb
|
|
92
84
|
});
|
93
85
|
return zaloga;
|
94
86
|
}
|
95
|
-
|
96
|
-
async function ignorirajNarocilo(blagovnica, mongo) {
|
87
|
+
export async function ignorirajNarocilo(blagovnica, mongo) {
|
97
88
|
console.error("Ignoriram spremembo zaloge na podlagi naročila ", blagovnica._id);
|
98
89
|
// prevent compiler error:
|
99
90
|
mongo.findOne("artikli", { noop: 1 });
|
100
91
|
return false;
|
101
92
|
}
|
102
|
-
|
103
|
-
async function spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve, mongo) {
|
93
|
+
export async function spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve, mongo) {
|
104
94
|
if (!blagovnica)
|
105
95
|
return;
|
106
96
|
if (blagovnica.razknjizena)
|
@@ -112,16 +102,16 @@ async function spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve, mongo)
|
|
112
102
|
// if (!inTransaction)
|
113
103
|
// await mongo.startTransaction()
|
114
104
|
let actions = {
|
115
|
-
dobava: () =>
|
116
|
-
poraba: () =>
|
117
|
-
prevzem: () =>
|
118
|
-
odpis: () =>
|
119
|
-
izdaja: () =>
|
120
|
-
vračilo: () =>
|
121
|
-
iznos: () =>
|
122
|
-
vnos: () =>
|
123
|
-
inventura: () =>
|
124
|
-
prenos: () =>
|
105
|
+
dobava: () => spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo),
|
106
|
+
poraba: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
107
|
+
prevzem: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
108
|
+
odpis: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
109
|
+
izdaja: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
110
|
+
vračilo: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
111
|
+
iznos: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
112
|
+
vnos: () => spremeniZalogoZaPorabo(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
113
|
+
inventura: () => spremeniZalogoZaInventuro(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
114
|
+
prenos: () => spremeniZalogoZaPrenos(blagovnica, nastavitve.razknjizbaZdravil, !!nastavitve.spremljamoSerijske, mongo),
|
125
115
|
"naročilo": () => ignorirajNarocilo(blagovnica, mongo),
|
126
116
|
};
|
127
117
|
if (!actions[blagovnica.vrsta])
|
@@ -142,7 +132,6 @@ async function spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve, mongo)
|
|
142
132
|
// await mongo.abortTransaction()
|
143
133
|
}
|
144
134
|
}
|
145
|
-
exports.spremeniZalogoNaPodlagiBlagovnice = spremeniZalogoNaPodlagiBlagovnice;
|
146
135
|
// (async function () {
|
147
136
|
// let mongo = new Mongo("max")
|
148
137
|
// console.log('>>1');
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"spremeniZalogo.js","sourceRoot":"","sources":["../src/spremeniZalogo.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"spremeniZalogo.js","sourceRoot":"","sources":["../src/spremeniZalogo.ts"],"names":[],"mappings":"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"}
|
@@ -1,20 +1,15 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
};
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
const artikel_1 = require("./types/artikel");
|
10
|
-
const razpisiDatum_1 = require("./razpisiDatum");
|
11
|
-
const spremeniZalogo_1 = require("./spremeniZalogo");
|
12
|
-
const serije_1 = require("./serije");
|
13
|
-
async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
1
|
+
import ObjectID from 'bson-objectid';
|
2
|
+
import { preracunajPorabo, vpisiSprememboZaloge } from "./preracunajZalogo";
|
3
|
+
import { VrstaSpremembeZaloge } from "./types/VrstaSpremembeZaloge";
|
4
|
+
import { jeIzdelek } from "./types/artikel";
|
5
|
+
import { razpisiDatum } from './razpisiDatum';
|
6
|
+
import { poisciInPreusmeriArtikel } from './spremeniZalogo';
|
7
|
+
import { odstraniSerijskeStevilke } from './serije';
|
8
|
+
export async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
14
9
|
if (!racun || racun.razknjizen)
|
15
10
|
return;
|
16
11
|
let vrstaDogodka = "prodaja";
|
17
|
-
let vrstaSpremembe =
|
12
|
+
let vrstaSpremembe = VrstaSpremembeZaloge.PORABA;
|
18
13
|
let vpisaliSmoSerijske = 0;
|
19
14
|
try {
|
20
15
|
//await mongo.startTransaction();
|
@@ -45,32 +40,32 @@ async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
45
40
|
});
|
46
41
|
if (["storitev", "potrošni material"].includes(postavka.kategorija))
|
47
42
|
continue;
|
48
|
-
let { artikel, faktorRazknjizbe } = await
|
43
|
+
let { artikel, faktorRazknjizbe } = await poisciInPreusmeriArtikel(postavka.artikel_id, 1, mongo, `ni artikla za razknjižbo prodaje: ${postavka.artikel_id} - ${postavka.opis}`);
|
49
44
|
if (!artikel)
|
50
45
|
continue;
|
51
46
|
let z = await mongo.findOne("zaloga", { skladisce_id: racun.skladisce_id, artikel_id: artikel._id });
|
52
|
-
let zaloga = z || { _id: new
|
53
|
-
let razknjiziZalogo =
|
47
|
+
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: racun.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
48
|
+
let razknjiziZalogo = jeIzdelek(artikel)
|
54
49
|
|| artikel.zalogoRazknjizi === "ob prodaji"
|
55
50
|
|| (!artikel.zalogoRazknjizi && nastavitve.razknjizbaZdravil === "ob prodaji");
|
56
51
|
if (!razknjiziZalogo)
|
57
52
|
continue;
|
58
53
|
let stara_nbc = artikel.nbc || 0;
|
59
|
-
let sprememba =
|
54
|
+
let sprememba = preracunajPorabo({
|
60
55
|
vrstaSpremembe,
|
61
56
|
zaloga,
|
62
57
|
kolicina: postavka.kolicina * (faktorRazknjizbe || 1),
|
63
58
|
stara_nbc,
|
64
59
|
});
|
65
|
-
zaloga =
|
60
|
+
zaloga = vpisiSprememboZaloge(zaloga, sprememba);
|
66
61
|
await mongo.upsert("zaloga", { artikel_id: artikel._id, skladisce_id: racun.skladisce_id }, {
|
67
62
|
zaloga: zaloga.zaloga,
|
68
63
|
vrednost: zaloga.vrednost,
|
69
64
|
});
|
70
65
|
await mongo.insert("spremembaZaloge", {
|
71
|
-
_id: new
|
66
|
+
_id: new ObjectID().toHexString(),
|
72
67
|
datum: racun.datum,
|
73
|
-
...
|
68
|
+
...razpisiDatum(racun.datum),
|
74
69
|
artikel_id: artikel._id,
|
75
70
|
skladisce_id: zaloga.skladisce_id,
|
76
71
|
kategorija: artikel.kategorija,
|
@@ -85,7 +80,7 @@ async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
85
80
|
});
|
86
81
|
try {
|
87
82
|
if (nastavitve.spremljamoSerijske) {
|
88
|
-
let vpisane = await
|
83
|
+
let vpisane = await odstraniSerijskeStevilke({
|
89
84
|
artikel_id: postavka.artikel_id,
|
90
85
|
skladisce_id: racun.skladisce_id,
|
91
86
|
serijske: postavka.stevilkaZdravila || "",
|
@@ -117,5 +112,4 @@ async function spremeniZalogoNaPodlagiRacuna(racun, nastavitve, mongo) {
|
|
117
112
|
//await mongo.abortTransaction();
|
118
113
|
}
|
119
114
|
}
|
120
|
-
exports.spremeniZalogoNaPodlagiRacuna = spremeniZalogoNaPodlagiRacuna;
|
121
115
|
//# 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,21 +1,16 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
};
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
const razpisiDatum_1 = require("./razpisiDatum");
|
13
|
-
const lahkoImaZalogo_1 = require("./lahkoImaZalogo");
|
14
|
-
const zeleniPribitek_1 = require("./zeleniPribitek");
|
15
|
-
const serije_1 = require("./serije");
|
16
|
-
async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
1
|
+
import ObjectID from 'bson-objectid';
|
2
|
+
import { izracunajNovoMaloprodajnoCeno } from './izracunajNovoMaloprodajnoCeno';
|
3
|
+
import { preracunajNabavo, vpisiSprememboZalogePoNabavi } from "./preracunajZalogo";
|
4
|
+
import { VrstaSpremembeZaloge } from "./types/VrstaSpremembeZaloge";
|
5
|
+
import { izracunajSestevkeBlagovniceRazenDobave, preracunajPostavkoDobave } from './preracunajPostavkoBlagovnice';
|
6
|
+
import { Repo } from 'cry-db';
|
7
|
+
import { razpisiDatum } from './razpisiDatum';
|
8
|
+
import { lahkoImaZalogo } from './lahkoImaZalogo';
|
9
|
+
import { zeleniPribitek } from './zeleniPribitek';
|
10
|
+
import { dodajSerijskeStevilke } from './serije';
|
11
|
+
export async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
17
12
|
let avtomatskaRazknjizba = {
|
18
|
-
_id:
|
13
|
+
_id: Repo.newid().toHexString(),
|
19
14
|
opis: `samodejna poraba za dobavo ${blagovnica.zapSt}`,
|
20
15
|
predhodnja_id: blagovnica._id,
|
21
16
|
datum: new Date(),
|
@@ -60,28 +55,28 @@ async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
|
60
55
|
continue;
|
61
56
|
}
|
62
57
|
let z = await mongo.findOne("zaloga", { skladisce_id: blagovnica.skladisce_id, artikel_id: postavka.artikel_id });
|
63
|
-
let zaloga = z || { _id: new
|
58
|
+
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
64
59
|
if (!postavka.enotaFaktor)
|
65
60
|
throw new Error("postavka dobave mora vsebovati polje enotaFaktor");
|
66
61
|
const faktorEnote = postavka.enotaFaktor || 1;
|
67
62
|
const kolicina = postavka.kolicina * faktorEnote;
|
68
63
|
const stara_nbc = artikel.nbc || 0;
|
69
64
|
const zadnja_nbc = artikel.zadnjaNbc || stara_nbc;
|
70
|
-
const sprememba =
|
71
|
-
vrstaSpremembe:
|
65
|
+
const sprememba = preracunajNabavo({
|
66
|
+
vrstaSpremembe: VrstaSpremembeZaloge.NABAVA,
|
72
67
|
zaloga,
|
73
68
|
kolicina: kolicina,
|
74
69
|
stara_nbc,
|
75
70
|
nova_nbc: postavka.nbcN / faktorEnote,
|
76
71
|
});
|
77
|
-
zaloga =
|
78
|
-
let imaZalogo =
|
72
|
+
zaloga = vpisiSprememboZalogePoNabavi(zaloga, sprememba);
|
73
|
+
let imaZalogo = lahkoImaZalogo(artikel, nastavitve.razknjizbaZdravil, /*zaDobavo*/ true);
|
79
74
|
if (imaZalogo) {
|
80
75
|
await vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mongo, zaloga, sprememba, blagovnica, avtomatskaRazknjizba, postavka, kolicina, postavka.nbcN / faktorEnote, n++);
|
81
76
|
}
|
82
77
|
await spremeniMpcArtikla(artikel, postavka, nastavitve, sprememba, zadnja_nbc, stara_nbc, postavka.nbc0 / faktorEnote, blagovnica.datum, blagovnica.dobavitelj_id, mongo);
|
83
78
|
if (nastavitve.spremljamoSerijske && postavka.stevilkeZdravil) {
|
84
|
-
await
|
79
|
+
await dodajSerijskeStevilke({
|
85
80
|
artikel_id: postavka.artikel_id,
|
86
81
|
skladisce_id: blagovnica.skladisce_id,
|
87
82
|
vir: "dobava",
|
@@ -91,20 +86,19 @@ async function spremeniZalogoZaDobavo(blagovnica, nastavitve, mongo) {
|
|
91
86
|
serijske: postavka.stevilkeZdravil,
|
92
87
|
}, mongo);
|
93
88
|
}
|
94
|
-
|
89
|
+
preracunajPostavkoDobave(postavka);
|
95
90
|
}
|
96
91
|
if (avtomatskaRazknjizba.postavke.length) {
|
97
|
-
let ss =
|
92
|
+
let ss = izracunajSestevkeBlagovniceRazenDobave(avtomatskaRazknjizba.postavke);
|
98
93
|
avtomatskaRazknjizba.razknjizena = new Date();
|
99
94
|
avtomatskaRazknjizba.status = "zaključena";
|
100
95
|
avtomatskaRazknjizba.dav = ss.dav;
|
101
96
|
avtomatskaRazknjizba.nbc = ss.nbc;
|
102
|
-
|
97
|
+
razpisiDatum(avtomatskaRazknjizba.datum, avtomatskaRazknjizba);
|
103
98
|
await mongo.upsert("blagovnice", { _id: avtomatskaRazknjizba._id }, avtomatskaRazknjizba);
|
104
99
|
}
|
105
100
|
return false;
|
106
101
|
}
|
107
|
-
exports.spremeniZalogoZaDobavo = spremeniZalogoZaDobavo;
|
108
102
|
async function vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mongo, zaloga, sprememba, blagovnica, avtomatskaRazknjizba, postavka, kolicina, nova_nbc, n) {
|
109
103
|
const razknjizimoTakoj = (artikel.kategorija === "zdravilo"
|
110
104
|
&& razknjizujObDobavi
|
@@ -126,9 +120,9 @@ async function vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mon
|
|
126
120
|
});
|
127
121
|
}
|
128
122
|
await mongo.insert("spremembaZaloge", {
|
129
|
-
_id: new
|
123
|
+
_id: new ObjectID().toHexString(),
|
130
124
|
datum: new Date(blagovnica.datum.valueOf() + n),
|
131
|
-
...
|
125
|
+
...razpisiDatum(blagovnica.datum),
|
132
126
|
artikel_id: artikel._id,
|
133
127
|
skladisce_id: zaloga.skladisce_id,
|
134
128
|
dokument_id: blagovnica._id,
|
@@ -143,14 +137,14 @@ async function vpisiSprememboZaloge(artikel, razknjizujObDobavi, nastavitve, mon
|
|
143
137
|
});
|
144
138
|
if (razknjizimoTakoj) {
|
145
139
|
await mongo.insert("spremembaZaloge", {
|
146
|
-
_id: new
|
140
|
+
_id: new ObjectID().toHexString(),
|
147
141
|
datum: blagovnica.datum,
|
148
|
-
...
|
142
|
+
...razpisiDatum(blagovnica.datum),
|
149
143
|
artikel_id: artikel._id,
|
150
144
|
skladisce_id: zaloga.skladisce_id,
|
151
145
|
dokument_id: blagovnica._id,
|
152
146
|
kategorija: artikel.kategorija,
|
153
|
-
vrstaSpremembe:
|
147
|
+
vrstaSpremembe: VrstaSpremembeZaloge.PORABA,
|
154
148
|
vrstaDogodka: 'poraba',
|
155
149
|
partner_id: blagovnica.dobavitelj_id,
|
156
150
|
zaloga: { stara: sprememba.zaloga.nova, nova: sprememba.zaloga.stara, sprememba: -sprememba.zaloga.sprememba },
|
@@ -180,7 +174,7 @@ async function spremeniMpcArtikla(artikel, postavka, nastavitve, sprememba, zadn
|
|
180
174
|
let razlog;
|
181
175
|
if (!postavka.mpcPreskoci) {
|
182
176
|
if (nastavitve.posodobiCeneObDobavi === "dobava") {
|
183
|
-
nova_mpc =
|
177
|
+
nova_mpc = izracunajNovoMaloprodajnoCeno(zadnja_nbc, nova_nbc, nastavitve, artikel);
|
184
178
|
razlog = "preračun";
|
185
179
|
}
|
186
180
|
if (postavka.mpcZakleni !== artikel.mpcLocked) {
|
@@ -188,7 +182,7 @@ async function spremeniMpcArtikla(artikel, postavka, nastavitve, sprememba, zadn
|
|
188
182
|
}
|
189
183
|
if (postavka.mpcNastavi) {
|
190
184
|
nova_mpc = Number(postavka.mpcNastavi.toFixed(nastavitve.zaokrozitevCen));
|
191
|
-
novi_pribitek =
|
185
|
+
novi_pribitek = zeleniPribitek({ mpc: nova_mpc, nbc: nova_nbc, dst: artikel.dst || 0 });
|
192
186
|
// postavka.mpcZakleni = true;
|
193
187
|
razlog = "nastavi mpc";
|
194
188
|
}
|
@@ -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,18 +1,13 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
};
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
const spremeniZalogo_1 = require("./spremeniZalogo");
|
12
|
-
const lahkoImaZalogo_1 = require("./lahkoImaZalogo");
|
13
|
-
const serije_1 = require("./serije");
|
14
|
-
const _1 = require(".");
|
15
|
-
async function spremeniZalogoZaInventuro(blagovnica, privzetaRazknjizaZdravil, spremljamoSerijske, mongo) {
|
1
|
+
import ObjectID from 'bson-objectid';
|
2
|
+
import { preracunajInventuro, vpisiSprememboZaloge } from "./preracunajZalogo";
|
3
|
+
import { VrstaSpremembeZaloge } from "./types/VrstaSpremembeZaloge";
|
4
|
+
import { preracunajPostavkoBlagovniceRazenDobave } from './preracunajPostavkoBlagovnice';
|
5
|
+
import { razpisiDatum } from './razpisiDatum';
|
6
|
+
import { poisciArtikel } from './spremeniZalogo';
|
7
|
+
import { lahkoImaZalogo } from './lahkoImaZalogo';
|
8
|
+
import { dodajSerijskeStevilke, odstraniSerijskeStevilkeZaArtikel } from './serije';
|
9
|
+
import { strniSerijske } from '.';
|
10
|
+
export async function spremeniZalogoZaInventuro(blagovnica, privzetaRazknjizaZdravil, spremljamoSerijske, mongo) {
|
16
11
|
for await (let postavka of blagovnica.postavke) {
|
17
12
|
if (["storitev", "potrošni material"].includes(postavka.kategorija))
|
18
13
|
continue;
|
@@ -31,36 +26,36 @@ async function spremeniZalogoZaInventuro(blagovnica, privzetaRazknjizaZdravil, s
|
|
31
26
|
continue;
|
32
27
|
}
|
33
28
|
;
|
34
|
-
let artikel = await
|
29
|
+
let artikel = await poisciArtikel(postavka.artikel_id, mongo, `ni artikla za inventuro: ${postavka.artikel_id} - ${postavka.naziv}`);
|
35
30
|
if (!artikel)
|
36
31
|
continue;
|
37
|
-
if (!
|
32
|
+
if (!lahkoImaZalogo(artikel, privzetaRazknjizaZdravil))
|
38
33
|
continue;
|
39
34
|
let z = await mongo.findOne("zaloga", { skladisce_id: blagovnica.skladisce_id, artikel_id: artikel._id });
|
40
|
-
let zaloga = z || { _id: new
|
35
|
+
let zaloga = z || { _id: new ObjectID().toHexString(), artikel_id: artikel._id, skladisce_id: blagovnica.skladisce_id, zaloga: 0, nbc: 0, vrednost: 0 };
|
41
36
|
let stara_nbc = artikel.nbc || 0;
|
42
37
|
if (postavka.popisanaKolicina === undefined) {
|
43
38
|
console.error(`popisanaKolicina manjka na inventuri ${blagovnica._id} za artikel ${artikel._id}`);
|
44
39
|
continue;
|
45
40
|
}
|
46
|
-
let sprememba =
|
47
|
-
vrstaSpremembe:
|
41
|
+
let sprememba = preracunajInventuro({
|
42
|
+
vrstaSpremembe: VrstaSpremembeZaloge.NASTAVI,
|
48
43
|
zaloga,
|
49
44
|
kolicina: postavka.popisanaKolicina,
|
50
45
|
stara_nbc,
|
51
46
|
});
|
52
|
-
zaloga =
|
47
|
+
zaloga = vpisiSprememboZaloge(zaloga, sprememba);
|
53
48
|
await mongo.upsert("zaloga", { artikel_id: artikel._id, skladisce_id: zaloga.skladisce_id }, {
|
54
49
|
nbc: stara_nbc,
|
55
50
|
zaloga: sprememba.zaloga.nova,
|
56
51
|
vrednost: sprememba.vrednostZaloge.nova,
|
57
52
|
});
|
58
53
|
postavka.kolicina = sprememba.zaloga.sprememba;
|
59
|
-
|
54
|
+
preracunajPostavkoBlagovniceRazenDobave(postavka);
|
60
55
|
await mongo.insert("spremembaZaloge", {
|
61
|
-
_id: new
|
56
|
+
_id: new ObjectID().toHexString(),
|
62
57
|
datum: blagovnica.datum,
|
63
|
-
...
|
58
|
+
...razpisiDatum(blagovnica.datum),
|
64
59
|
artikel_id: artikel._id,
|
65
60
|
skladisce_id: zaloga.skladisce_id,
|
66
61
|
dokument_id: blagovnica._id,
|
@@ -81,18 +76,18 @@ async function spremeniZalogoZaInventuro(blagovnica, privzetaRazknjizaZdravil, s
|
|
81
76
|
uporabnik: blagovnica.izvedel,
|
82
77
|
dokument_id: blagovnica._id,
|
83
78
|
};
|
84
|
-
await
|
79
|
+
await odstraniSerijskeStevilkeZaArtikel({
|
85
80
|
...spec,
|
86
81
|
ostane: postavka.stevilkeZdravil?.length ? 0 : postavka.popisanaKolicina
|
87
82
|
}, mongo);
|
88
83
|
if (!!postavka.stevilkeZdravil?.length) {
|
89
|
-
let dodane = await
|
84
|
+
let dodane = await dodajSerijskeStevilke({
|
90
85
|
...spec,
|
91
86
|
serijske: postavka.stevilkeZdravil,
|
92
87
|
stevilo: postavka.popisanaKolicina,
|
93
88
|
}, mongo);
|
94
89
|
postavka.vtipkaneStevilkeZdravil = postavka.stevilkeZdravil;
|
95
|
-
postavka.stevilkeZdravil =
|
90
|
+
postavka.stevilkeZdravil = strniSerijske(dodane.map(a => a.serijska));
|
96
91
|
}
|
97
92
|
}
|
98
93
|
await mongo.upsert("artikli", { _id: artikel._id, }, { zadnjaInventura: blagovnica.datum });
|
@@ -103,5 +98,4 @@ async function spremeniZalogoZaInventuro(blagovnica, privzetaRazknjizaZdravil, s
|
|
103
98
|
});
|
104
99
|
return false;
|
105
100
|
}
|
106
|
-
exports.spremeniZalogoZaInventuro = spremeniZalogoZaInventuro;
|
107
101
|
//# sourceMappingURL=spremeniZalogoZaInventuro.js.map
|