js-klikvet-logic-worker 2.3.22 → 2.3.24

package/src/worker.mts

@@ -1,13 +1,13 @@
 
-import assert  from 'assert'
-import clonedeep  from 'lodash.clonedeep'
-import makeDir  from 'make-dir'
-import fs  from 'fs'
-import path  from 'path'
-import { Worker, Client }  from 'cry-ebus2'
+import assert from 'assert'
+import clonedeep from 'lodash.clonedeep'
+import makeDir from 'make-dir'
+import fs from 'fs'
+import path from 'path'
+import { Worker, Client } from 'cry-ebus2'
 import { Mongo } from 'cry-db'
-import { arrayToObject, dedup, Log, serialize, sleep } from 'cry-helpers'
-import { ArtikelOsnova, Blagajna, Blagovnica, Cepljenje, Lokacija, Narocen, Nastavitve, Poslovalnica, PostavkaRacuna, Racun, Skladisce, VrstaPoslovnegaDogodka, VrstaRazknjizbeZdravila, VsotaDobavZaObdobje, anonimizirajPodatke, certs, createMongoForAnonimizacija, dobavaZdravil, ensureIndexes, karticaArtikla, koledarVeterinarja, mojPromet, pobrisiNeuporabljeno, podatkiRejca, poisciBlagovnice, poisciNeuporabljeno, porabaInProdajaZdravil, porabaZaDobavnico, prodajaZdravil, prodano, prodanoInPorabljeno, promet, racuni, racunovodji, razknjiziBlagovnico, razknjiziDobavnico, smsCepljen, smsCepljenjaNaDan, smsNarocen, smsNaroceniNaDan, spremembaZalogeZaObdobje, spremeniZalogoNaPodlagiRacuna, stranke, updateOpombeRejca, updatePotrditevBrejosti, updatePresusitve, updateStatusOsemenitve, vrniPopravekDobavniceCeNiZaPorabo, zakljucekBlagajne, zakljucekPolneInventureSestaviInZapisi, zalogaNaDan, zalogaPoDnevih, zaracunajDobavnice, zdruziStranke, zdruziPaciente } from 'cry-klikvet-logic'
+import { Log, serialize, sleep } from 'cry-helpers'
+import { Blagajna, Blagovnica, Cepljenje, Narocen, Nastavitve, Poslovalnica, PostavkaRacuna, Racun, Skladisce, VrstaPoslovnegaDogodka, VrstaRazknjizbeZdravila, VsotaDobavZaObdobje, anonimizirajPodatke, certs, createMongoForAnonimizacija, dobavaZdravil, ensureIndexes, karticaArtikla, koledarVeterinarja, mojPromet, pobrisiNeuporabljeno, podatkiRejca, poisciBlagovnice, poisciNeuporabljeno, porabaInProdajaZdravil, prodajaZdravil, prodano, prodanoInPorabljeno, promet, racuni, racunovodji, razknjiziBlagovnico, razknjiziDobavnico, smsCepljen, smsCepljenjaNaDan, smsNarocen, smsNaroceniNaDan, spremembaZalogeZaObdobje, spremeniZalogoNaPodlagiRacuna, stranke, updateOpombeRejca, updatePotrditevBrejosti, updatePresusitve, updateStatusOsemenitve, zakljucekBlagajne, zakljucekPolneInventureSestaviInZapisi, zalogaNaDan, zalogaPoDnevih, zaracunajDobavnice, zdruziStranke, zdruziPaciente, Obravnava, ArtikelKarkoli, zapisiPoraboZaObravnavo, zapisiPorabeZaObravnave, zapisiPorabeZaDobavnice, } from 'cry-klikvet-logic'
 import { OsemenitevGoveda, StatusOsemenitve } from 'cry-klikvet-logic/dist/types/teren.mjs'
 import { RacunZaKnjizbo } from 'cry-klikvet-logic/dist/spremeniZalogo.mjs'
 import { Dobavnica } from 'cry-klikvet-logic/dist/types/Dobavnica.mjs'
@@ -16,7 +16,7 @@ import { Dobavnica } from 'cry-klikvet-logic/dist/types/Dobavnica.mjs'
 const DEFAULT_SERVICE_NAME = 'klikvet'
 let log = new Log(['KLIKVET'])
 
-type Obj = Record<string,any>
+type Obj = Record<string, any>
 
 export type KlikvetClientRequest = "ping"
     | { operation: "ping" }
@@ -25,7 +25,7 @@ export type KlikvetClientRequest = "ping"
     | { operation: "racuni-isci-create-pipeline", spec: Obj }
     | { operation: "promet-exec-pipeline", tenant: string, pipeline?: Obj, spec?: Obj }
     | { operation: "racuni-isci-exec-pipeline", tenant: string, pipeline: Obj, spec?: Obj }
-    | { operation: "porocilo-racunovodji", tenant: string, odDne: Date, doDne: Date, racuniPravnim?: boolean, racuniOdlozeno?: boolean }
+    | { operation: "porocilo-racunovodji", tenant: string, odDne: Date, doDne: Date, racuniPravnim?: boolean, racuniOdlozeno?: boolean, lokacija?: string, skladisca?: string[] }
     | { operation: "zakljucek-blagajne", tenant: string, odDne: Date; doDne: Date; rounding: number; stevilka?: string; }
     | { operation: "moj-promet", tenant: string, username: string, odDne: Date, doDne: Date }
     | { operation: "prodano", tenant: string, username: string, odDne: Date, doDne: Date }
@@ -46,6 +46,8 @@ export type KlikvetClientRequest = "ping"
     | { operation: "razknjizi-blagovnice", tenant: string, }
     | { operation: "razknjizi-blagovnico", tenant: string, _id: string }
     | { operation: "porabe-za-dobavnice", tenant: string, username: string }
+    | { operation: "poraba-za-obravnavo", tenant: string, username: string, id: string, }
+    | { operation: "porabe-za-obravnave", tenant: string, username: string, }
     | { operation: "kartica", tenant: string, _id: string, razknjizba: VrstaRazknjizbeZdravila, skladisca_ids: string[] }
     | { operation: "blagovnice", tenant: string, odDne: Date, doDne: Date }
     | { operation: "dobava-zdravil", tenant: string, odDne: Date, doDne: Date }
@@ -66,22 +68,21 @@ export type KlikvetClientRequest = "ping"
     | { operation: "poslji-smse-cepljenim", tenant: string, dan: Date, dniPrej?: number, nacin: string }
     | { operation: "seznam-narocenih-za-sms", tenant: string, dan: Date, dniPrej?: number, nacin: string }
     | { operation: "seznam-cepljenj-za-sms", tenant: string, dan: Date, dniPrej?: number }
-    | { operation: "potrditev-brejosti", tenant: string, _id: string, kdo: string, db?: string , breja: boolean}
-    | { operation: "v-presusitev", tenant: string, presusitev?: boolean, db?: string, _id:string, kdo: string}
-    | { operation: "status-osemenitve", tenant: string,  db?: string, _id:string, kdo: string, status: StatusOsemenitve }
+    | { operation: "potrditev-brejosti", tenant: string, _id: string, kdo: string, db?: string, breja: boolean }
+    | { operation: "v-presusitev", tenant: string, presusitev?: boolean, db?: string, _id: string, kdo: string }
+    | { operation: "status-osemenitve", tenant: string, db?: string, _id: string, kdo: string, status: StatusOsemenitve }
     | { operation: "opomba-rejca-osemenitve", tenant: string, db?: string, _id: string, kdo: string, opomba: string }
     | { operation: "podatki-rejca", tenant: string, rejciGeslo: string, rejciKoda: string }
-    | { operation: "zaracunaj-dobavnice", tenant: string, dobavnice_ids: string[], lokacija_id: string, naprava_id: string, izdal: string,}
+    | { operation: "zaracunaj-dobavnice", tenant: string, dobavnice_ids: string[], lokacija_id: string, naprava_id: string, izdal: string, }
     | { operation: "anonimiziraj-podatke", tenant: string, letNazaj?: number }
     | { operation: "razknjizi-dobavnico", tenant: string, _id: string }
     | { operation: "zdruzi-stranke", tenant: string, v: string, iz: string[] }
     | { operation: "zdruzi-paciente", tenant: string, v: string, iz: string[] }
     ;
 
-    
 
-function round(num: number, dec = 2)
-{
+
+function round(num: number, dec = 2) {
     return Number(num.toFixed(dec))
 };
 
@@ -98,25 +99,46 @@ export class KlikvetLogicWorker extends Worker {
         gsm?: string,
     }, opts: any) {
 
-        if (tenant==="klikvet") tenant=""
+        if (tenant === "klikvet") tenant = ""
         const asService = (tenant
             ? `${DEFAULT_SERVICE_NAME}-${tenant}`
             : DEFAULT_SERVICE_NAME);
-        
+
         super(asService, opts)
 
         this.client = new Client({ clientChecksBrokerWithHeartbeat: false });
         this.gsm = gsm || "";
-      
+
         console.log("starting klikvet as", asService)
     }
 
+    async porabaZaObravnavo(mongo: Mongo, data: { tenant: string, id: string, username: string }) {
+        console.log('porabaZaObravnavo',data);
+        
+        let nastavitve = await this.dbNastavitve(data.tenant);
+        let obravnava = await this.dbFindById<Obravnava>(data.tenant, "obravnave", data.id);
+        if (!obravnava) throw new Error("porabaZaObravnavo: ni obravnave " + data?.id);
+        let artikel_ids = obravnava.koraki.map(k => (k.postavke || []).map(p => p.artikel_id)).flat(2).filter(a => !!a);
+        let artikli = await this.dbFind<ArtikelKarkoli>(data.tenant, "artikli", { _id: { $in: artikel_ids } });
+        let poraba = await zapisiPoraboZaObravnavo({ tenant: data.tenant, mongo, obravnava, nastavitve, username: data.username, artikli });
+
+        console.log('poraba',poraba);
+        
+        return poraba;
+    }
+
+    async porabeZaObravnave(mongo: Mongo, data: { tenant: string, username: string, od?: Date }) {
+        let porabe = await zapisiPorabeZaObravnave({ tenant: data.tenant, mongo, username: data.username, od: data.od });
+        console.log('porabeZaObravnave',porabe);
+        return porabe;
+    }
+
     async publishMsg(what: { channel: string, payload: any }) {
         try {
             await super.publish(what.channel, what.payload)
         } catch (err) {
             console.log('publish failed, continue working', err.message);
-            
+
         }
     }
 
@@ -142,7 +164,7 @@ export class KlikvetLogicWorker extends Worker {
         console.dir(opts, { depth: 10 });
     }
 
-    async process(data: KlikvetClientRequest) : Promise<any> {
+    async process(data: KlikvetClientRequest): Promise<any> {
         let ret
         try {
             await this.resetMongo()
@@ -153,16 +175,16 @@ export class KlikvetLogicWorker extends Worker {
         }
 
         await this.closeMongo()
-        
+
         return ret;
     }
 
-    async processLogic(data: KlikvetClientRequest) : Promise<any> {
+    async processLogic(data: KlikvetClientRequest): Promise<any> {
 
         log.debug(`klikvet worker request of type ${typeof data}`, data)
-        
+
         // console.log('data', data);
-        
+
         if (data === 'ping') {
             return 'pong from ' + this.service;
         }
@@ -170,7 +192,7 @@ export class KlikvetLogicWorker extends Worker {
         if (typeof data === "string" && (data as string)?.match?.(/^ping/i)) {
             let ms = (data as string).match(/\d+/)?.[0]
             console.log('ms', ms);
-            
+
             if (ms) await sleep(parseInt(ms))
             return 'pong from ' + this.service + (ms ? ` after ${ms}ms` : '')
         }
@@ -178,10 +200,10 @@ export class KlikvetLogicWorker extends Worker {
         if (data.operation === 'ping') {
             return { ping: 'pong' }
         }
-        
+
         assert(data.operation, 'must specify operation')
         assert(this.client, 'missing EbusClient')
-        
+
         if (data.operation === 'promet-get-config') {
             return promet;
         }
@@ -190,12 +212,12 @@ export class KlikvetLogicWorker extends Worker {
             assert(data.spec, 'must specify data.spec')
             return promet.createAggregationPipeline(data.spec)
         }
-        
+
         if (data.operation === 'racuni-isci-create-pipeline') {
             assert(data.spec, 'must specify data.spec')
             return racuni.isci.createAggregationPipeline(data.spec)
         }
-        
+
         if (data.operation === 'promet-exec-pipeline') {
             assert(data.tenant, 'must specify tenant')
             assert(data.pipeline || data.spec, 'must specify data.spec or data.pipeline')
@@ -219,6 +241,10 @@ export class KlikvetLogicWorker extends Worker {
             assert(data.odDne, 'must odDne')
             assert(data.doDne, 'must doDne')
 
+            if (data.lokacija) {
+                data.skladisca = await this.vsaSkladiscaLokacije(data.lokacija, data.tenant);
+            }
+
             let pipeline = racunovodji.createAggregationPipeline(data)
             let podatki = await racunovodji.execPipeline(pipeline.pipeline, data.tenant)
             let prviZadnji = await racunovodji.getFirstLastBills(data.tenant, pipeline.match)
@@ -234,7 +260,7 @@ export class KlikvetLogicWorker extends Worker {
             let spremembaZaloge = await spremembaZalogeZaObdobje({ ...data, poVrstah: true })
             let spremembaKonsignacije = await spremembaZalogeZaObdobje({ ...data, poVrstah: true, samoKonsignacija: true })
             let vsotaDobav = await VsotaDobavZaObdobje({ ...data })
-            
+
             return { podatki, racuniOdlozeno, racuniPravnim, kategorije, stornirani, placila, zaloga: { pred, po }, konsignacija: { pred: predKonsignacija, po: poKonsignacija }, spremembaZaloge, spremembaKonsignacije, vsotaDobav, prviZadnji };
         }
 
@@ -303,7 +329,7 @@ export class KlikvetLogicWorker extends Worker {
             assert(data.certPass, "must specify certPass")
             assert(this.client)
             let timeoutError = ""
-            
+
             try {
                 timeoutError = "furs/cert: FURS podsistem se ni odzval."
                 let res: { certSerial: string, certTaxNo: number, certName: string, certValidUntil: Date, certIssuer: string } | undefined = (await this.client.request('durs', { operation: 'add cert', data: { cert: data.certBase64, password: data.certPass } }, { receiveTimeout: 2000 }));
@@ -312,7 +338,7 @@ export class KlikvetLogicWorker extends Worker {
                 if (!res) {
                     return { certMessage: "furs/cert ni nič vrnil", certOk: false }
                 }
-                
+
                 timeoutError = "furs/cert: spodletelo je pisanje v bazo."
 
                 await this.client.request('db', {
@@ -321,7 +347,7 @@ export class KlikvetLogicWorker extends Worker {
                     db: data.tenant,
                     query: { serijskaStevilka: res.certSerial }
                 });
-                
+
                 let req = {
                     operation: 'upsert',
                     collection: 'certifikati',
@@ -352,15 +378,15 @@ export class KlikvetLogicWorker extends Worker {
                     cert,
                     tenant: data.tenant,
                 };
-                
+
                 log.info("furs-reg-cert returns", ret)
-                
+
                 return ret;
 
             } catch (err) {
 
                 // console.log('err',err);
-            
+
                 if (err.reason === "reject" && err.data.message && /Invalid password/gi.test(err.data.message)) {
                     return {
                         certMessage: "Napačno geslo.",
@@ -386,19 +412,19 @@ export class KlikvetLogicWorker extends Worker {
 
             assert(data.certId, "must specify certId")
             assert(data.taxNo, "must specify taxNo")
-            
+
             log.debug('removing cert', data);
 
             let result = await this.client.request('durs',
                 { operation: 'remove cert', data: { taxNo: data.taxNo, } }, { receiveTimeout: 2000 });
 
             log.trace('cert removed', result);
-            
+
             return {
                 ok: true,
                 result: result
             };
-            
+
         }
 
         if (data.operation === "furs-register-premise") {
@@ -511,7 +537,7 @@ export class KlikvetLogicWorker extends Worker {
             }, 2000);
             return res
         };
-        
+
         if (data.operation === "furs-register-all-invoices") {
             let all = await this.registerAllInvoices(data);
             setTimeout(async () => {
@@ -544,7 +570,7 @@ export class KlikvetLogicWorker extends Worker {
             assert(data.tenant, "must specify tenant")
             return await this.razknjiziBlagovnice(data);
         };
-        
+
         if (data.operation === "porabe-za-dobavnice") {
             assert(data.tenant, "must specify tenant")
             let ret = await this.porabeZaDobavnice(data);
@@ -552,6 +578,21 @@ export class KlikvetLogicWorker extends Worker {
             return ret;
         };
 
+        if (data.operation === "poraba-za-obravnavo") {
+            assert(data.tenant, "must specify tenant");
+            assert(data.username, "must specify username");
+            assert(data.id, "must specify id");
+            let ret = await this.porabaZaObravnavo(this.mongo!, data);
+            return ret;
+        };
+
+        if (data.operation === "porabe-za-obravnave") {
+            assert(data.tenant, "must specify tenant");
+            assert(data.username, "must specify username");
+            let ret = await this.porabeZaObravnave(this.mongo!, data);
+            return ret;
+        };
+
         if (data.operation === "razknjizi-dobavnico") {
             assert(data._id, "must specify _id of Dobavnica")
             assert(data.tenant, "must specify tenant")
@@ -800,7 +841,7 @@ export class KlikvetLogicWorker extends Worker {
             assert(data.tenant, "must specify tenant")
             assert(["demo", "demo2", "dev", "test"].includes(data.tenant), "cnly valid for demo, dev, test");
             assert(data.letNazaj, "must specify letNazaj");
-            
+
             return await anonimizirajPodatke(createMongoForAnonimizacija(data.tenant), parseInt(data.letNazaj.toString() || "1"));
         };
 
@@ -808,7 +849,7 @@ export class KlikvetLogicWorker extends Worker {
             assert(data.tenant, "must specify tenant")
             assert(data.v, "must specify v");
             assert(data.iz, "must specify iz");
-            
+
             return await this.zdruziStranke(data);
         };
 
@@ -816,7 +857,7 @@ export class KlikvetLogicWorker extends Worker {
             assert(data.tenant, "must specify tenant")
             assert(data.v, "must specify v");
             assert(data.iz, "must specify iz");
-            
+
             return await this.zdruziPaciente(data);
         };
 
@@ -1032,530 +1073,479 @@ export class KlikvetLogicWorker extends Worker {
         return moje?.[0]
     }
 
+    async vsaSkladiscaLokacije(lokacija_id: string, tenant: string) {
+        let vsa: Skladisce[] = (await this.dbFind(tenant, "skladisca", { _deleted: { $exists: false } })) as Skladisce[];
+        return vsa.filter(s => s.lokacija_id.toString() === lokacija_id)?.map(s => s._id);
+    }
+
     async porabeZaDobavnice(data: { tenant: string, username: string }) {
 
-        let nastavitve = await this.dbNastavitve(data.tenant);
-        let lokacije = await this.dbFind<Lokacija>(data.tenant, "lokacije", {});
-        let od = new Date(new Date().valueOf() - 365 * 24 * 60 * 60 * 1000);
+        let ret = await zapisiPorabeZaDobavnice({
+            mongo: this.mongo!,
+            tenant: data.tenant,
+            username: data.username,
+        });
+        console.log('porabeZaDobavnice', ret);
+        return ret;
 
-        let nerazknijzene = await this.dbFind<Dobavnica>(data.tenant, "dobavnice", {
-            datumDokumenta: { $gte: od },
-            status: { $in: ["izdana", "zaračunana"] },
-            poraba_id: { $exists: false },
-            razknjizbaPreskocena: { $exists: false },
-            _deleted: { $exists: false }
-        }, { sort: { datumDokumenta: 1 } });
+    }
 
-        let artikel_ids = dedup(nerazknijzene.map(d => d.postavke.map(p => p.artikel_id?.toString())).flat());
+    async razknjiziBlagovnice(data: { tenant: string }) {
+        this.mongo!.emitPublishEvents(false);
+        this.mongo!.useAuditing(false)
+        this.mongo!.setDb(data.tenant);
+        this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/razknjiziBlagovnice" });
 
-        let artikli = await this.dbFind<ArtikelOsnova>(data.tenant, "artikli", {
-            _id: { $in: artikel_ids }
-        })
+        let od = new Date(new Date().valueOf() - 60 * 24 * 60 * 60 * 1000);
 
+        // poišči tiste, ki bi morale že biti razknjižene, pa niso
+        {
+            let od = new Date(new Date().valueOf() - 3 * 60 * 24 * 60 * 60 * 1000);
+            let vpisane = await this.dbFind<Blagovnica>(data.tenant, "blagovnice", { datum: { $gte: od } }, { project: { _id: 1, status: 1 } });
+            let idjiVpisanih = vpisane.map(b => b._id.toString());
+
+            let zaPovrnit = await this.dbFind<Blagovnica>(data.tenant, "odprteBlagovnice", { _deleted: { $ne: "hack" }, status: "zaključena", datum: { $gte: od }, _id: { $nin: idjiVpisanih } }, { project: { status: 1, dokumentDobavitelja: 1, vrsta: 1 } });
+
+            for await (let b of zaPovrnit) {
+                console.log("vračam blagovnico v razkljižno", data.tenant, b)
+                await this.dbUpsert(data.tenant, "odprteBlagovnice", b._id, { razknjizena: undefined, _deleted: undefined, _vrnjenoVRazknjizbo: new Date() });
+            }
+        }
+
+        let nerazknijzene = await this.dbFind<Dobavnica>(data.tenant, "odprteBlagovnice",
+            { datum: { $gte: od }, status: "zaključena", razknjizena: { $exists: false } },
+            { sort: { datum: 1 } }
+        );
         let vse = 0, razknjizene = 0
         let napake = []
         for await (let dobavnica of nerazknijzene) {
-            let lokacija = lokacije.find(l => l._id.toString() === dobavnica.lokacija_id.toString());
-            if (!lokacija) continue;
-            let zaPorabo = vrniPopravekDobavniceCeNiZaPorabo({
-                dobavnica,
-                nastavitve,
-                lokacija
-            })
-            if (zaPorabo === false) continue;
-            if (zaPorabo && typeof zaPorabo === "object" && zaPorabo.razknjizbaPreskocena) {
-                await this.dbUpsert(data.tenant, "dobavnice", dobavnica._id, zaPorabo );
-                continue
-            }
-            if (!dobavnica.lokacija_id) console.error("dobavnica nima lokacije", dobavnica._id, dobavnica.stevilka)
             try {
-                let skladisce_id = dobavnica.skladisce_id || ((await this.skladisceLokacije(dobavnica.lokacija_id, data.tenant))._id);
                 vse++
-                let poraba = await porabaZaDobavnico({
-                    dobavnica,
-                    nastavitve,
-                    skladisce_id,
-                    lokacija_id: dobavnica.lokacija_id,
-                    username: data.username,
-                    artikli: arrayToObject(artikli, "_id"),
-                });
+                await this.razknjiziBlagovnico(dobavnica._id.toString(), data.tenant)
+                razknjizene++
+            } catch (err) {
+                napake.push(err)
+            }
+        }
+        return { ok: vse === razknjizene, vse, razknjizene, napake }
+    }
 
-                console.log('poraba', poraba);
+    async razknjiziDobavnice(data: { tenant: string }) {
 
+        this.mongo!.emitPublishEvents(false)
+        this.mongo!.useAuditing(false)
+        this.mongo!.setDb(data.tenant)
+        this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/razknjiziDobavnice" })
 
-                if (poraba) {
-                    poraba.status = "zaključena"
-                    let p = await this.dbUpsert(data.tenant, "odprteBlagovnice", poraba._id, poraba);
-                    await this.dbUpsert(data.tenant, "dobavnice", dobavnica._id, { poraba_id: p._id, poraba_sestavljena: new Date() });
-                }
-                if (poraba === null) {
-                    await this.dbUpsert(data.tenant, "dobavnice", dobavnica._id, { poraba_id: null, poraba_preskocena: new Date() });
-                }
+        let od = new Date(new Date().valueOf() - 60 * 24 * 60 * 60 * 1000)
+        let nerazknijzene = await this.dbFind<Dobavnica>(data.tenant, "dobavnice",
+            {
+                datum: { $gte: od }, status: "izdana",
+                razknjizena: { $not: { $type: "date" } },
+                razknjizbaPreskocena: { $exists: false },
+            },
+            { sort: { datum: 1 } }
+        );
+        let vse = 0, razknjizene = 0
+        let napake = []
+        for await (let blagovnica of nerazknijzene) {
+            try {
+                vse++
+                await this.razknjiziDobavnico(blagovnica._id.toString(), data.tenant)
                 razknjizene++
             } catch (err) {
                 napake.push(err)
             }
         }
         return { ok: vse === razknjizene, vse, razknjizene, napake }
+
     }
 
-    async razknjiziBlagovnice(data: { tenant: string })
-    {
-        this.mongo!.emitPublishEvents(false);
-        this.mongo!.useAuditing(false)
-        this.mongo!.setDb(data.tenant);
-        this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/razknjiziBlagovnice" });
+    // async razknjiziBlagovnico(_id, tenant)
+    // {
+    //     let nastavitve = await dbNastavitve(tenant);
+    //     this.mongo!.setDb(tenant)
+    //     this.mongo!.setAudit({ tenant, app: "klikvet/razknjiziBlagovnico/1" })
 
-    let od = new Date(new Date().valueOf() - 60 * 24 * 60 * 60 * 1000);
+    //     await logic.zakljuciBlagovnico(_id, this.mongo);
 
-    // poišči tiste, ki bi morale že biti razknjižene, pa niso
-    {
-        let od = new Date(new Date().valueOf() - 3 * 60 * 24 * 60 * 60 * 1000);
-        let vpisane = await this.dbFind<Blagovnica>(data.tenant, "blagovnice", { datum: { $gte: od } }, { project: { _id: 1, status: 1 } });
-        let idjiVpisanih = vpisane.map(b => b._id.toString());
+    //     /** @type {Blagovnica}} */
+    //     let blagovnica = (/** @type {Blagovnica} */ await this.dbFindById(tenant, "blagovnice", _id)) 
+    //     if (!blagovnica) throw new Error(`ne morem razknjižiti blagovnice, ki je ni: ${_id}, tenant ${tenant}`)
 
-        let zaPovrnit = await this.dbFind<Blagovnica>(data.tenant, "odprteBlagovnice", { _deleted: { $ne: "hack" }, status: "zaključena", datum: { $gte: od }, _id: { $nin: idjiVpisanih } }, { project: { status: 1, dokumentDobavitelja: 1, vrsta: 1 } });
+    //     this.mongo!.setDb(tenant)
+    //     this.mongo!.setAudit({ tenant, app: "klikvet/razknjiziBlagovnico/2" })
 
-        for await (let b of zaPovrnit) {
-            console.log("vračam blagovnico v razkljižno", data.tenant, b)
-            await this.dbUpsert(data.tenant, "odprteBlagovnice", b._id, { razknjizena: undefined, _deleted: undefined, _vrnjenoVRazknjizbo: new Date() });
-        }
-    }
+    //     await logic.spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve, this.mongo);
+    //     await pobrisiZalogoNaDan(tenant, [ blagovnica.datum ]);
+    // }
+
+    async razknjiziBlagovnico(_id: string, tenant: string) {
 
-    let nerazknijzene = await this.dbFind<Dobavnica>(data.tenant, "odprteBlagovnice",
-        { datum: { $gte: od }, status: "zaključena", razknjizena: { $exists: false } },
-        { sort: { datum: 1 } }
-    );
-    let vse = 0, razknjizene = 0
-    let napake = []
-    for await (let dobavnica of nerazknijzene) {
+        if (this.razknjizujem) return;
+        this.razknjizujem = true;
         try {
-            vse++
-            await this.razknjiziBlagovnico(dobavnica._id.toString(), data.tenant)
-            razknjizene++
+            this.mongo!.emitPublishEvents(false)
+            this.mongo!.useAuditing(false)
+            this.mongo!.setDb(tenant)
+            this.mongo!.setAudit({ tenant, app: "klikvet/razknjiziBlagovnico" })
+
+            let blagovnica = await razknjiziBlagovnico(_id, this.mongo as any);
+            this.razknjizujem = false;
+            return blagovnica
         } catch (err) {
-            napake.push(err)
+            console.error("razknjiziBlagovnico", tenant)
         }
+        this.razknjizujem = false;
+        return undefined
     }
-    return { ok: vse === razknjizene, vse, razknjizene, napake }
-}
 
-async razknjiziDobavnice(data: { tenant: string }) {
-
-    this.mongo!.emitPublishEvents(false)
-    this.mongo!.useAuditing(false)
-    this.mongo!.setDb(data.tenant)
-    this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/razknjiziDobavnice" })
-
-    let od = new Date(new Date().valueOf() - 60 * 24 * 60 * 60 * 1000)
-    let nerazknijzene = await this.dbFind<Dobavnica>(data.tenant, "dobavnice",
-        {
-            datum: { $gte: od }, status: "izdana",
-            razknjizena: { $not: { $type: "date" } },
-            razknjizbaPreskocena: { $exists: false },
-        },
-        { sort: { datum: 1 } }
-    );
-    let vse = 0, razknjizene = 0
-    let napake = []
-    for await (let blagovnica of nerazknijzene) {
+    async razknjiziDobavnico(_id: string, tenant: string) {
+        if (this.razknjizujem) return;
+        this.razknjizujem = true;
         try {
-            vse++
-            await this.razknjiziDobavnico(blagovnica._id.toString(), data.tenant)
-            razknjizene++
+            this.mongo!.setDb(tenant)
+            this.mongo!.setAudit({ tenant, app: "klikvet/razknjiziDobavnico" })
+            let dobavnica = await razknjiziDobavnico(_id, this.mongo as any);
+            this.razknjizujem = false;
+            return dobavnica
         } catch (err) {
-            napake.push(err)
+            console.error("razknjiziDobavnico", tenant, err?.message || err)
         }
-    }
-    return { ok: vse === razknjizene, vse, razknjizene, napake }
-
-}
-
-// async razknjiziBlagovnico(_id, tenant)
-// {
-//     let nastavitve = await dbNastavitve(tenant);
-//     this.mongo!.setDb(tenant)
-//     this.mongo!.setAudit({ tenant, app: "klikvet/razknjiziBlagovnico/1" })
-
-//     await logic.zakljuciBlagovnico(_id, this.mongo);
-
-//     /** @type {Blagovnica}} */
-//     let blagovnica = (/** @type {Blagovnica} */ await this.dbFindById(tenant, "blagovnice", _id)) 
-//     if (!blagovnica) throw new Error(`ne morem razknjižiti blagovnice, ki je ni: ${_id}, tenant ${tenant}`)
-
-//     this.mongo!.setDb(tenant)
-//     this.mongo!.setAudit({ tenant, app: "klikvet/razknjiziBlagovnico/2" })
-
-//     await logic.spremeniZalogoNaPodlagiBlagovnice(blagovnica, nastavitve, this.mongo);
-//     await pobrisiZalogoNaDan(tenant, [ blagovnica.datum ]);
-// }
-
-async razknjiziBlagovnico(_id: string, tenant: string) {
-
-    if (this.razknjizujem) return;
-    this.razknjizujem = true;
-    try {
-        this.mongo!.emitPublishEvents(false)
-        this.mongo!.useAuditing(false)
-        this.mongo!.setDb(tenant)
-        this.mongo!.setAudit({ tenant, app: "klikvet/razknjiziBlagovnico" })
-
-        let blagovnica = await razknjiziBlagovnico(_id, this.mongo as any);
         this.razknjizujem = false;
-        return blagovnica
-    } catch (err) {
-        console.error("razknjiziBlagovnico", tenant)
-    }
-    this.razknjizujem = false;
-    return undefined
-}
-
-async razknjiziDobavnico(_id: string, tenant: string) {
-    if (this.razknjizujem) return;
-    this.razknjizujem = true;
-    try {
-        this.mongo!.setDb(tenant)
-        this.mongo!.setAudit({ tenant, app: "klikvet/razknjiziDobavnico" })
-        let dobavnica = await razknjiziDobavnico(_id, this.mongo as any);
-        this.razknjizujem = false; 
-        return dobavnica
-    } catch (err) {
-        console.error("razknjiziDobavnico", tenant, err?.message || err)
+        return undefined
     }
-    this.razknjizujem = false;
-    return undefined
-}
 
-async registerAllInvoices(data: { tenant: string, env: string, }) {
-    if (this.razknjizujem) return { nall: 0, nok: 0, napake: ["worker že razknjižuje"] };
-    this.razknjizujem = true;
-    try {
-        assert(data.tenant, "must specify tenant")
-
-        let err = null;
-        let napake = new Set()
+    async registerAllInvoices(data: { tenant: string, env: string, }) {
+        if (this.razknjizujem) return { nall: 0, nok: 0, napake: ["worker že razknjižuje"] };
+        this.razknjizujem = true;
         try {
+            assert(data.tenant, "must specify tenant")
 
-            err = "Podsistem db ni dosegljiv."
+            let err = null;
+            let napake = new Set()
+            try {
 
-            this.mongo!.setDb(data.tenant)
-            this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/registerAllInvoices" })
+                err = "Podsistem db ni dosegljiv."
 
-            let myquery = { eor: null, negotovinski: { $ne: true }, leto: { $gte: 2022 } };
-            let env = data.env || (await this.mongo!.findOne<Nastavitve>("nastavitve", {}))?.okolje || "error"
+                this.mongo!.setDb(data.tenant)
+                this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/registerAllInvoices" })
 
-            let all = await this.mongo!.find<Racun>("racuni", myquery, { project: { _id: 1 }, limit: 1000, })
-            err = "Napaka pri potrjevanju računov."
+                let myquery = { eor: null, negotovinski: { $ne: true }, leto: { $gte: 2022 } };
+                let env = data.env || (await this.mongo!.findOne<Nastavitve>("nastavitve", {}))?.okolje || "error"
 
-            let n = 0;
-            try {
-                for await (let r of all) {
-                    let res = await this.registerInvoice({ tenant: data.tenant, env, _id: r._id.toString() }, true);
-                    if (res instanceof Error || typeof res === "string") {
-                        console.error("cannot register invoice (1)",data.tenant,r._id,res)
-                    } else {
-                        if (res.eor) n++;
-                        if (res.fursError) napake.add(res.fursError)
+                let all = await this.mongo!.find<Racun>("racuni", myquery, { project: { _id: 1 }, limit: 1000, })
+                err = "Napaka pri potrjevanju računov."
+
+                let n = 0;
+                try {
+                    for await (let r of all) {
+                        let res = await this.registerInvoice({ tenant: data.tenant, env, _id: r._id.toString() }, true);
+                        if (res instanceof Error || typeof res === "string") {
+                            console.error("cannot register invoice (1)", data.tenant, r._id, res)
+                        } else {
+                            if (res.eor) n++;
+                            if (res.fursError) napake.add(res.fursError)
+                        }
                     }
+                } catch (e) {
+                    err = e.message;
+                    console.log('err', err);
+                    throw new Error()
                 }
-            } catch (e) {
-                err = e.message;
-                console.log('err', err);
-                throw new Error()
-            }
 
-            this.razknjizujem = false;
-            return { nall: all.length, nok: n, napake: [...napake] };
+                this.razknjizujem = false;
+                return { nall: all.length, nok: n, napake: [...napake] };
 
+            } catch (err) {
+                console.error('registerAllInvoices', err);
+                this.razknjizujem = false;
+                throw new Error(err);
+            }
         } catch (err) {
-            console.error('registerAllInvoices', err);
+            console.error("registerAllInvoices", data.tenant, err?.message || err)
             this.razknjizujem = false;
-            throw new Error(err);
+            return { nall: 0, nok: 0, napake: [err.message || err] };
         }
-    } catch (err) {
-        console.error("registerAllInvoices", data.tenant, err?.message || err)
-        this.razknjizujem = false;
-        return { nall: 0, nok: 0, napake: [err.message || err] };
     }
-}
 
-async registerCert(db: string, davcnaStevilka: string) {
-    let cert = (await this.client?.request('db', {
-        operation: 'findOne',
-        db,
-        collection: "certifikati",
-        query: { davcnaStevilka }
-    }, { receiveTimeout: 3000 })) as { certBase64: string, certPass: string };
+    async registerCert(db: string, davcnaStevilka: string) {
+        let cert = (await this.client?.request('db', {
+            operation: 'findOne',
+            db,
+            collection: "certifikati",
+            query: { davcnaStevilka }
+        }, { receiveTimeout: 3000 })) as { certBase64: string, certPass: string };
 
-    let res = (await this.client?.request('durs', { operation: 'add cert', data: { cert: cert.certBase64, password: cert.certPass } }, { receiveTimeout: 4000 }));
-    return res
-}
-
-async registerInvoice(data: { env:string, tenant: string, _id: string}, kasneje = false) {
-    this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/registerInvoice" })
-
-    assert(data._id, "must specify _id of racun")
-    assert(["error", "production", "test"].includes(data.env), "must specify env")
-    assert(data.tenant, "must specify tenant")
-
-    let timeoutError = "";
-    try {
-        // poišči račun
-        timeoutError = "Db podsistem se ni odzval."
-        let racun = await this.dbFindById<Racun>(data.tenant, "racuni", data._id)
-        if (!racun) return `registerInvoice for ${data.tenant}: ni računa ${data._id}`
-        if (racun.negotovinski) return "negotovinski račun ne bo fiskaliziran";
-
-        let blagajna = await this.dbFindById<Blagajna>(data.tenant, "blagajne", racun.blagajna_id)
-        if (!blagajna) throw new Error("cannot locate blagajna: " + racun.blagajna_id)
-        let poslovalnica = await this.dbFindById<Poslovalnica>(data.tenant, "poslovalnice", blagajna.poslovalnica_id)
-        if (!blagajna) throw new Error("cannot locate poslovalnica: " + racun.blagajna_id)
-        let veterina = await this.dbFindById<Nastavitve>(data.tenant, "nastavitve", poslovalnica.veterina_id)
-        if (!veterina) throw new Error("cannot locate poslovalnica: " + poslovalnica.veterina_id)
-        if (!racun.izdalDs) throw new Error("Uporabnik verjetno nima vpisane davčne številke.")
-
-        // če gre za popravek računa, poveži izvorni račun na ta popravek
-        if (racun.predhodniRacun && racun.predhodniRacun._id ) {
-            this.dbUpdateById(data.tenant, "racuni", racun.predhodniRacun._id.toString(), {
-                naslednjiRacun: {
-                    _id: data._id.toString(),
-                    datum: racun.datum,
-                    stevilka: racun.stevilka,
-                }
-            })
-        }
+        let res = (await this.client?.request('durs', { operation: 'add cert', data: { cert: cert.certBase64, password: cert.certPass } }, { receiveTimeout: 4000 }));
+        return res
+    }
 
-        let TaxNumber = (veterina.dsCertifikata || veterina.davcnaStevilka)
-        TaxNumber = parseInt(TaxNumber.toString().match(/\d+/)?.toString()||"0");
-        if (!TaxNumber) return new Error("no TaxNumber for "+data.tenant)
-
-        let Invoice = {
-            TaxNumber,
-            IssueDateTime: new Date(racun.datum),
-            NumberingStructure: "B",
-            InvoiceIdentifier: {
-                BusinessPremiseID: poslovalnica.koda,
-                ElectronicDeviceID: blagajna.nazivZaIzpis,
-                InvoiceNumber: racun.stRacuna.toString(),
-            },
-            InvoiceAmount: round(racun.mpc),
-            PaymentAmount: round(racun.mpc),
-            TaxesPerSeller: [{
-                VAT: racun.davki.map(d => {
-                    return {
-                        TaxRate: round(d.dst * 100),
-                        TaxableAmount: round(d.osnova),
-                        TaxAmount: round(d.davek),
-                    }
-                })
-            }],
-            OperatorTaxNumber: Number(racun.izdalDs),
-            //ProtectedID: null,
-            SubsequentSubmit: kasneje,
-            // ReferenceInvoice: [{
-            //     ReferenceInvoiceIdentifier: {
-            //         BusinessPremiseID: "36CF",
-            //         ElectronicDeviceID: "BLAG2",
-            //         InvoiceNumber: "144"
-            //     },
-            //     ReferenceInvoiceIssueDateTime: new Date()
-            // }],
-        };
-        if (racun.predhodniRacun) {
-            let s = racun.predhodniRacun.stevilka.split("-");
-            (Invoice as any).ReferenceInvoice = [{
-                ReferenceInvoiceIdentifier: {
-                    BusinessPremiseID: s[2],
-                    ElectronicDeviceID: s[1],
-                    InvoiceNumber: s[0],
-                },
-                ReferenceInvoiceIssueDateTime: racun.predhodniRacun.datum,
-            }];
-        }
-        let DursEnv = veterina.okolje;
-        if (DursEnv !== data.env) throw new Error(`data.env (${data.env}) !== veterina.okolje (${veterina.okolje})`);
+    async registerInvoice(data: { env: string, tenant: string, _id: string }, kasneje = false) {
+        this.mongo!.setAudit({ tenant: data.tenant, app: "klikvet/registerInvoice" })
 
-        // console.dir(Invoice, {depth:10});
+        assert(data._id, "must specify _id of racun")
+        assert(["error", "production", "test"].includes(data.env), "must specify env")
+        assert(data.tenant, "must specify tenant")
 
-        // davčno potrdi račun
-        let furs: { error?: string, EOR?: string, ZOI?: string, QR?: string } = {};
-        let napaka : string|undefined = ""
+        let timeoutError = "";
         try {
+            // poišči račun
+            timeoutError = "Db podsistem se ni odzval."
+            let racun = await this.dbFindById<Racun>(data.tenant, "racuni", data._id)
+            if (!racun) return `registerInvoice for ${data.tenant}: ni računa ${data._id}`
+            if (racun.negotovinski) return "negotovinski račun ne bo fiskaliziran";
+
+            let blagajna = await this.dbFindById<Blagajna>(data.tenant, "blagajne", racun.blagajna_id)
+            if (!blagajna) throw new Error("cannot locate blagajna: " + racun.blagajna_id)
+            let poslovalnica = await this.dbFindById<Poslovalnica>(data.tenant, "poslovalnice", blagajna.poslovalnica_id)
+            if (!blagajna) throw new Error("cannot locate poslovalnica: " + racun.blagajna_id)
+            let veterina = await this.dbFindById<Nastavitve>(data.tenant, "nastavitve", poslovalnica.veterina_id)
+            if (!veterina) throw new Error("cannot locate poslovalnica: " + poslovalnica.veterina_id)
+            if (!racun.izdalDs) throw new Error("Uporabnik verjetno nima vpisane davčne številke.")
+
+            // če gre za popravek računa, poveži izvorni račun na ta popravek
+            if (racun.predhodniRacun && racun.predhodniRacun._id) {
+                this.dbUpdateById(data.tenant, "racuni", racun.predhodniRacun._id.toString(), {
+                    naslednjiRacun: {
+                        _id: data._id.toString(),
+                        datum: racun.datum,
+                        stevilka: racun.stevilka,
+                    }
+                })
+            }
 
-            timeoutError = "FURS podsistem se ni odzval."
+            let TaxNumber = (veterina.dsCertifikata || veterina.davcnaStevilka)
+            TaxNumber = parseInt(TaxNumber.toString().match(/\d+/)?.toString() || "0");
+            if (!TaxNumber) return new Error("no TaxNumber for " + data.tenant)
+
+            let Invoice = {
+                TaxNumber,
+                IssueDateTime: new Date(racun.datum),
+                NumberingStructure: "B",
+                InvoiceIdentifier: {
+                    BusinessPremiseID: poslovalnica.koda,
+                    ElectronicDeviceID: blagajna.nazivZaIzpis,
+                    InvoiceNumber: racun.stRacuna.toString(),
+                },
+                InvoiceAmount: round(racun.mpc),
+                PaymentAmount: round(racun.mpc),
+                TaxesPerSeller: [{
+                    VAT: racun.davki.map(d => {
+                        return {
+                            TaxRate: round(d.dst * 100),
+                            TaxableAmount: round(d.osnova),
+                            TaxAmount: round(d.davek),
+                        }
+                    })
+                }],
+                OperatorTaxNumber: Number(racun.izdalDs),
+                //ProtectedID: null,
+                SubsequentSubmit: kasneje,
+                // ReferenceInvoice: [{
+                //     ReferenceInvoiceIdentifier: {
+                //         BusinessPremiseID: "36CF",
+                //         ElectronicDeviceID: "BLAG2",
+                //         InvoiceNumber: "144"
+                //     },
+                //     ReferenceInvoiceIssueDateTime: new Date()
+                // }],
+            };
+            if (racun.predhodniRacun) {
+                let s = racun.predhodniRacun.stevilka.split("-");
+                (Invoice as any).ReferenceInvoice = [{
+                    ReferenceInvoiceIdentifier: {
+                        BusinessPremiseID: s[2],
+                        ElectronicDeviceID: s[1],
+                        InvoiceNumber: s[0],
+                    },
+                    ReferenceInvoiceIssueDateTime: racun.predhodniRacun.datum,
+                }];
+            }
+            let DursEnv = veterina.okolje;
+            if (DursEnv !== data.env) throw new Error(`data.env (${data.env}) !== veterina.okolje (${veterina.okolje})`);
 
-            furs = ((await this.client!.request('durs', {
-                operation: 'register invoice',
-                data: { Invoice, DursEnv, tenant: data.tenant }
-            }, { receiveTimeout: 4000 })) as { Durs: { error?:string } })?.Durs;
+            // console.dir(Invoice, {depth:10});
 
+            // davčno potrdi račun
+            let furs: { error?: string, EOR?: string, ZOI?: string, QR?: string } = {};
+            let napaka: string | undefined = ""
             try {
-                console.log("register invoice", data.tenant, Invoice.TaxNumber, `${Invoice?.InvoiceIdentifier?.BusinessPremiseID}-${Invoice?.InvoiceIdentifier?.ElectronicDeviceID}-${Invoice?.InvoiceIdentifier?.InvoiceNumber}`, Invoice.InvoiceAmount, furs.EOR);
-            } catch (err) {
-                console.error(`err logging furs response`);
-            }
 
-            if (furs?.error && furs.error.match(/no such file/g)) {
-                console.warn("no certificate, register it");
-                // register cert
-                timeoutError = "Samodejna registracija digitalnega potrdila furs spodletela."
+                timeoutError = "FURS podsistem se ni odzval."
 
-                await this.registerCert(data.tenant, Invoice.TaxNumber?.toString());
-                // re-submit invoice
-                furs = (
-                    (await this.client!.request('durs', {
+                furs = ((await this.client!.request('durs', {
                     operation: 'register invoice',
                     data: { Invoice, DursEnv, tenant: data.tenant }
                 }, { receiveTimeout: 4000 })) as { Durs: { error?: string } })?.Durs;
+
+                try {
+                    console.log("register invoice", data.tenant, Invoice.TaxNumber, `${Invoice?.InvoiceIdentifier?.BusinessPremiseID}-${Invoice?.InvoiceIdentifier?.ElectronicDeviceID}-${Invoice?.InvoiceIdentifier?.InvoiceNumber}`, Invoice.InvoiceAmount, furs.EOR);
+                } catch (err) {
+                    console.error(`err logging furs response`);
+                }
+
+                if (furs?.error && furs.error.match(/no such file/g)) {
+                    console.warn("no certificate, register it");
+                    // register cert
+                    timeoutError = "Samodejna registracija digitalnega potrdila furs spodletela."
+
+                    await this.registerCert(data.tenant, Invoice.TaxNumber?.toString());
+                    // re-submit invoice
+                    furs = (
+                        (await this.client!.request('durs', {
+                            operation: 'register invoice',
+                            data: { Invoice, DursEnv, tenant: data.tenant }
+                        }, { receiveTimeout: 4000 })) as { Durs: { error?: string } })?.Durs;
+                }
+                if (furs?.error && furs.error.match(/SSL alert number 40/gi)) {
+                    console.warn("certifikat potekel");
+                    timeoutError = "Je digitalno potrdilo FURS pretečeno?"
+                    throw new Error(furs.error)
+                }
+                if (furs?.error && furs.error.match(/no such file/g)) {
+                    console.warn("no certificate, register it");
+                    // register cert
+                    timeoutError = "Samodejna registracija digitalnega potrdila furs spodletela."
+
+                    await this.registerCert(data.tenant, Invoice.TaxNumber?.toString());
+                    // re-submit invoice
+                    furs = ((await this.client!.request('durs', {
+                        operation: 'register invoice',
+                        data: { Invoice, DursEnv, tenant: data.tenant }
+                    }, { receiveTimeout: 4000 })) as { Durs: any }).Durs;
+                }
+
+            } catch (err) {
+                console.error("Err calling durs register.invoice", err)
+                napaka = `${timeoutError} (${err && err.data && err.data.message})`
             }
-            if (furs?.error && furs.error.match(/SSL alert number 40/gi)) {
-                console.warn("certifikat potekel");
-                timeoutError = "Je digitalno potrdilo FURS pretečeno?"
-                throw new Error(furs.error)
+
+            napaka = napaka || furs?.error;
+            if (!napaka && (!furs?.EOR || !furs?.ZOI)) napaka = "furs sistem ni vrnil EOR ali ZOI"
+            let fursObj = napaka ? {
+                zoi: furs?.ZOI,
+                eor: furs?.EOR,
+                qr: furs?.QR,
+                fursError: `furs/račun: ${napaka}`,
+                davcnoSpodletloPrvic: racun.davcnoSpodletloPrvic || new Date(),
+                davcnoSpodletloZadnjic: new Date(),
+                davcnoSpodletloPoskusov: (racun.davcnoSpodletloPoskusov || 0) + 1
+            } : {
+                zoi: furs.ZOI,
+                eor: furs.EOR,
+                qr: furs.QR,
+                davcnoPotrjeno: new Date(),
             }
-            if (furs?.error && furs.error.match(/no such file/g)) {
-                console.warn("no certificate, register it");
-                // register cert
-                timeoutError = "Samodejna registracija digitalnega potrdila furs spodletela."
 
-                await this.registerCert(data.tenant, Invoice.TaxNumber?.toString());
-                // re-submit invoice
-                furs = ((await this.client!.request('durs', {
-                    operation: 'register invoice',
-                    data: { Invoice, DursEnv, tenant: data.tenant }
-                }, { receiveTimeout: 4000 })) as { Durs: any }).Durs;
+            // posodobi račun
+            timeoutError = "Napaka pri vpisu davčno potrjenega računa: Db podsistem se ne odziva več."
+            let updated = await this.dbUpdateById(data.tenant, "racuni", data._id, fursObj);
+
+            try {
+                let dir = path.join('./racuni', new Date().getFullYear().toString(), data.tenant)
+                !fs.existsSync(dir) && makeDir.sync(dir);
+                fs.writeFileSync(path.join(dir, racun.stevilka), serialize.pack(clonedeep({ ...racun, ...updated }), false));
+            } catch (err) {
+                console.log("napaka pri zapisu izdanega računa na disk", err)
             }
 
+            return updated;
+
         } catch (err) {
-            console.error("Err calling durs register.invoice", err)
-            napaka = `${timeoutError} (${err && err.data && err.data.message})`
-        }
 
-        napaka = napaka || furs?.error;
-        if (!napaka && (!furs?.EOR || !furs?.ZOI)) napaka = "furs sistem ni vrnil EOR ali ZOI"
-        let fursObj = napaka ? {
-            zoi: furs?.ZOI,
-            eor: furs?.EOR,
-            qr: furs?.QR,
-            fursError: `furs/račun: ${napaka}`,
-            davcnoSpodletloPrvic: racun.davcnoSpodletloPrvic || new Date(),
-            davcnoSpodletloZadnjic: new Date(),
-            davcnoSpodletloPoskusov: (racun.davcnoSpodletloPoskusov || 0) + 1
-        } : {
-            zoi: furs.ZOI,
-            eor: furs.EOR,
-            qr: furs.QR,
-            davcnoPotrjeno: new Date(),
+            return {
+                fursError: `furs/račun: ${err.message || err}`,
+            }
         }
+    };
 
-        // posodobi račun
-        timeoutError = "Napaka pri vpisu davčno potrjenega računa: Db podsistem se ne odziva več."
-        let updated = await this.dbUpdateById(data.tenant, "racuni", data._id, fursObj);
+    /**
+     * Stornira račun" tako, da kreira nov odprtRacun z negativnimi postavkami.
+     * @param {string} db
+     * @param {string} id 
+     */
+    async storno(db: string, id: string) {
+        // poglej, če morda storno že poteka
 
-        try {
-            let dir = path.join('./racuni', new Date().getFullYear().toString(), data.tenant)
-            !fs.existsSync(dir) && makeDir.sync(dir);
-            fs.writeFileSync(path.join(dir, racun.stevilka), serialize.pack(clonedeep({ ...racun, ...updated }), false));
-        } catch (err) {
-            console.log("napaka pri zapisu izdanega računa na disk", err)
-        }
+        this.mongo!.setDb(db)
+        this.mongo!.setAudit({ tenant: db, app: "klikvet/storno/1" })
 
-        return updated;
+        let obstojeci = await this.mongo!.findOne("odprtiRacuni", { "predhodniRacun._id": id })
 
-    } catch (err) {
+        //     (await client.requestPromise('db', {
+        //     operation: 'findOne',
+        //     db: string,
+        //: string     collection: 'odprtiRacuni',
+        //     query: { "predhodniRacun._id": id  }
+        // }, null, 2000)).data;
 
-        return {
-            fursError: `furs/račun: ${err.message || err}`,
-        }
-    }
-};
+        if (obstojeci) return obstojeci;
 
-/**
- * Stornira račun" tako, da kreira nov odprtRacun z negativnimi postavkami.
- * @param {string} db
- * @param {string} id 
- */
-async storno(db: string, id: string) {
-    // poglej, če morda storno že poteka
+        let racun = clonedeep(await this.dbFindById<Racun>(db, "racuni", id));
 
-    this.mongo!.setDb(db)
-    this.mongo!.setAudit({ tenant: db, app: "klikvet/storno/1" })
+        if (!racun) throw new Error(`storno: ni računa ${id}`)
 
-    let obstojeci = await this.mongo!.findOne("odprtiRacuni", { "predhodniRacun._id": id })
 
-    //     (await client.requestPromise('db', {
-    //     operation: 'findOne',
-    //     db: string,
-    //: string     collection: 'odprtiRacuni',
-    //     query: { "predhodniRacun._id": id  }
-    // }, null, 2000)).data;
+        // povezi racuna
+        racun.predhodniRacun = {
+            _id: racun._id,
+            stevilka: racun.stevilka,
+            datum: racun.datum
+        };
 
-    if (obstojeci) return obstojeci;
+        // ustvari negativne postavke
+        let flds: (keyof PostavkaRacuna)[] = ['kolicina', 'tpop', 'tnbc', 'tdav', 'tprc', 'tmpc'];
+        racun.postavke.forEach(postavka => {
+            flds.forEach((f: keyof PostavkaRacuna) => {
+                (postavka[f] as any) = -(postavka[f] || 0)
+            })
+        });
+
+        // ustvari negativne vsote
+        let rflds: (keyof Racun)[] = ['mpc', 'prc', 'dav', 'pop', 'nbc'];
+        rflds.forEach(f => {
+            (racun[f] as any) = -(racun[f] || 0)
+        });
+        // zbrisi polja, ki jih ne sme biti na novem računu
+
+        // odstrani polja, ki so odvec
+
+        let dflds: (keyof Racun)[] =
+            ["zapSt", "stRacuna", "pripis", "izdal", "opomba", "zoi", "eor", "stKopij", "stevilka",
+                "idIzdanegaRacuna", "valuta", "izdalDs", "razknjizen", "statusIzdaje",
+                "odprt", "odprtIz", "naprava_id", "izPredracuna_id", "izPredracuna_st",
+                "izDobavnice_id", "izDobavnice_st", "datum", "zbirnik",
+                "opomba", "fursError", "davcnoPotrjeno", "davcnoSpodletloPrvic",
+                "davcnoSpodletloZadnjic", "davcnoSpodletloPoskusov", "stKopij", "datumiKopij",
+                "navodiloStranki", "kontrola", "vCrpDatum", "vCrpKdo", "vCrp",
+
+            ];
+        dflds.forEach(f => {
+            delete racun[f]
+        });
+
+        racun.datum = new Date();
+        // tole nastavi GUI
+        racun.placila = [];
+        racun.davki = [];
+        (racun._id as any) = undefined;
 
-    let racun = clonedeep(await this.dbFindById<Racun>(db, "racuni", id));
+        this.mongo!.setDb(db)
+        this.mongo!.setAudit({ tenant: db, app: "klikvet/storno/2" })
 
-    if (!racun) throw new Error(`storno: ni računa ${id}`)
+        let odprtiRacun = await this.mongo!.insert("odprtiRacuni", racun)
 
+        //     (await client.requestPromise('db', {
+        //     operation: 'insert',
+        //     db: string,
+        //: string     collection: "odprtiRacuni",
+        //     insert: racun,
+        // }, null, 2000)).data;
 
-    // povezi racuna
-    racun.predhodniRacun = {
-        _id: racun._id,
-        stevilka: racun.stevilka,
-        datum: racun.datum
+        return odprtiRacun;
     };
 
-    // ustvari negativne postavke
-    let flds: (keyof PostavkaRacuna)[] = ['kolicina', 'tpop', 'tnbc', 'tdav', 'tprc', 'tmpc'];
-    racun.postavke.forEach(postavka => {
-        flds.forEach( (f: keyof PostavkaRacuna) => {
-            (postavka[f] as any) = -(postavka[f]||0)
-        })
-    });
-
-    // ustvari negativne vsote
-    let rflds: (keyof Racun)[] = ['mpc', 'prc', 'dav', 'pop', 'nbc'];
-    rflds.forEach(f => {
-       (racun[f] as any) = -(racun[f]||0)
-    });
-    // zbrisi polja, ki jih ne sme biti na novem računu
-
-    // odstrani polja, ki so odvec
-
-    let dflds: (keyof Racun)[] =
-        ["zapSt", "stRacuna", "pripis", "izdal", "opomba", "zoi", "eor", "stKopij", "stevilka",
-            "idIzdanegaRacuna", "valuta", "izdalDs", "razknjizen", "statusIzdaje",
-            "odprt", "odprtIz", "naprava_id", "izPredracuna_id", "izPredracuna_st",
-            "izDobavnice_id", "izDobavnice_st", "datum", "zbirnik",
-            "opomba", "fursError", "davcnoPotrjeno", "davcnoSpodletloPrvic",
-            "davcnoSpodletloZadnjic", "davcnoSpodletloPoskusov", "stKopij", "datumiKopij",
-            "navodiloStranki", "kontrola", "vCrpDatum", "vCrpKdo", "vCrp",
-
-        ];
-    dflds.forEach(f => {
-        delete racun[f]
-    });
-
-    racun.datum = new Date();
-    // tole nastavi GUI
-    racun.placila = [];
-    racun.davki = [];
-    (racun._id as any) = undefined;
-
-    this.mongo!.setDb(db)
-    this.mongo!.setAudit({ tenant: db, app: "klikvet/storno/2" })
-
-    let odprtiRacun = await this.mongo!.insert("odprtiRacuni", racun)
-
-    //     (await client.requestPromise('db', {
-    //     operation: 'insert',
-    //     db: string,
-    //: string     collection: "odprtiRacuni",
-    //     insert: racun,
-    // }, null, 2000)).data;
-
-    return odprtiRacun;
-};
-
 
 
 }