diff --git a/web/templates/stranice/nivelacije.html b/web/templates/stranice/nivelacije.html index d0dba1e..db0366a 100644 --- a/web/templates/stranice/nivelacije.html +++ b/web/templates/stranice/nivelacije.html @@ -42,10 +42,10 @@ {{.Datum.Format "02.01.2006."}} {{.ArtikalNaziv}} - {{printf "%.2f" .StaraCena}} - {{printf "%.2f" .NovaCena}} + {{dinari .StaraCena}} + {{dinari .NovaCena}} - {{if .Poskupljenje}}+{{end}}{{printf "%.2f" .Razlika}} + {{if .Poskupljenje}}+{{end}}{{dinari .Razlika}}
{{if .Poskupljenje}}+{{end}}{{printf "%.1f" .Procenat}}%
diff --git a/web/templates/stranice/pdv_kir.html b/web/templates/stranice/pdv_kir.html index e619702..73d2245 100644 --- a/web/templates/stranice/pdv_kir.html +++ b/web/templates/stranice/pdv_kir.html @@ -48,12 +48,12 @@ {{.DatumPrometa.Format "02.01.2006."}} {{.BrojDokumenta}} {{.KupacNaziv}}{{if .KupacPib}}
{{.OznakaPoreskogBroja}}: {{.KupacPib}}
{{end}} - {{printf "%.2f" .OsnovicaOpsta}} - {{printf "%.2f" .PdvOpsta}} - {{printf "%.2f" .OsnovicaPosebna}} - {{printf "%.2f" .PdvPosebna}} - {{printf "%.2f" .OslobodenUkupno}} - {{printf "%.2f" .Ukupno}} + {{dinari .OsnovicaOpsta}} + {{dinari .PdvOpsta}} + {{dinari .OsnovicaPosebna}} + {{dinari .PdvPosebna}} + {{dinari .OslobodenUkupno}} + {{dinari .Ukupno}} {{if eq .Izvor "rucno"}}
@@ -72,12 +72,12 @@ UKUPNO ({{len .Zapisi}}) - {{printf "%.2f" .Sume.OsnovicaOpsta}} - {{printf "%.2f" .Sume.PdvOpsta}} - {{printf "%.2f" .Sume.OsnovicaPosebna}} - {{printf "%.2f" .Sume.PdvPosebna}} - {{printf "%.2f" .Sume.OslobodenUkupno}} - {{printf "%.2f" .Sume.Ukupno}} + {{dinari .Sume.OsnovicaOpsta}} + {{dinari .Sume.PdvOpsta}} + {{dinari .Sume.OsnovicaPosebna}} + {{dinari .Sume.PdvPosebna}} + {{dinari .Sume.OslobodenUkupno}} + {{dinari .Sume.Ukupno}} diff --git a/web/templates/stranice/pdv_kpr.html b/web/templates/stranice/pdv_kpr.html index a8f61e7..0474a2b 100644 --- a/web/templates/stranice/pdv_kpr.html +++ b/web/templates/stranice/pdv_kpr.html @@ -49,13 +49,13 @@ {{.DatumPrometa.Format "02.01.2006."}} {{.BrojDokumenta}}{{if .Uvoz}}
UVOZ
{{end}} {{.DobavljacNaziv}}{{if .DobavljacPib}}
{{.OznakaPoreskogBroja}}: {{.DobavljacPib}}
{{end}} - {{printf "%.2f" .OsnovicaOpsta}} - {{printf "%.2f" .PdvOpsta}} - {{printf "%.2f" .OsnovicaPosebna}} - {{printf "%.2f" .PdvPosebna}} - {{printf "%.2f" .PdvBezOdbitka}} - {{printf "%.2f" .OslobodenNabavka}} - {{printf "%.2f" .Ukupno}} + {{dinari .OsnovicaOpsta}} + {{dinari .PdvOpsta}} + {{dinari .OsnovicaPosebna}} + {{dinari .PdvPosebna}} + {{dinari .PdvBezOdbitka}} + {{dinari .OslobodenNabavka}} + {{dinari .Ukupno}} {{if eq .Izvor "rucno"}} @@ -74,13 +74,13 @@ UKUPNO ({{len .Zapisi}}) - {{printf "%.2f" .Sume.OsnovicaOpsta}} - {{printf "%.2f" .Sume.PdvOpsta}} - {{printf "%.2f" .Sume.OsnovicaPosebna}} - {{printf "%.2f" .Sume.PdvPosebna}} - {{printf "%.2f" .Sume.PdvBezOdbitka}} - {{printf "%.2f" .Sume.OslobodenNabavka}} - {{printf "%.2f" .Sume.Ukupno}} + {{dinari .Sume.OsnovicaOpsta}} + {{dinari .Sume.PdvOpsta}} + {{dinari .Sume.OsnovicaPosebna}} + {{dinari .Sume.PdvPosebna}} + {{dinari .Sume.PdvBezOdbitka}} + {{dinari .Sume.OslobodenNabavka}} + {{dinari .Sume.Ukupno}} diff --git a/web/templates/stranice/pdv_obracun.html b/web/templates/stranice/pdv_obracun.html index 0765187..60a6ec6 100644 --- a/web/templates/stranice/pdv_obracun.html +++ b/web/templates/stranice/pdv_obracun.html @@ -38,23 +38,23 @@ Opšta stopa (20%) - {{printf "%.2f" .KirSume.OsnovicaOpsta}} - {{printf "%.2f" .Obracun.IzlazniPdvOpsta}} + {{dinari .KirSume.OsnovicaOpsta}} + {{dinari .Obracun.IzlazniPdvOpsta}} Posebna stopa (10%) - {{printf "%.2f" .KirSume.OsnovicaPosebna}} - {{printf "%.2f" .Obracun.IzlazniPdvPosebna}} + {{dinari .KirSume.OsnovicaPosebna}} + {{dinari .Obracun.IzlazniPdvPosebna}} Oslobođen promet - {{printf "%.2f" .KirSume.OslobodenUkupno}} + {{dinari .KirSume.OslobodenUkupno}} — Ukupno izlazni PDV - {{printf "%.2f" .Obracun.IzlazniPdvUkupno}} + {{dinari .Obracun.IzlazniPdvUkupno}} @@ -63,23 +63,23 @@ Opšta stopa (20%) - {{printf "%.2f" .KprSume.OsnovicaOpsta}} - {{printf "%.2f" .Obracun.OdbitniPdvOpsta}} + {{dinari .KprSume.OsnovicaOpsta}} + {{dinari .Obracun.OdbitniPdvOpsta}} Posebna stopa (10%) - {{printf "%.2f" .KprSume.OsnovicaPosebna}} - {{printf "%.2f" .Obracun.OdbitniPdvPosebna}} + {{dinari .KprSume.OsnovicaPosebna}} + {{dinari .Obracun.OdbitniPdvPosebna}} PDV bez prava na odbitak — - {{printf "%.2f" .KprSume.PdvBezOdbitka}} + {{dinari .KprSume.PdvBezOdbitka}} Ukupno odbitni PDV - {{printf "%.2f" .Obracun.OdbitniPdvUkupno}} + {{dinari .Obracun.OdbitniPdvUkupno}} @@ -96,7 +96,7 @@
izlazni − odbitni PDV
- {{printf "%.2f" .Obracun.ObavezaApsolutna}} RSD + {{dinari .Obracun.ObavezaApsolutna}} RSD
diff --git a/web/templates/stranice/servis_predracun.html b/web/templates/stranice/servis_predracun.html index 48927cf..a394abe 100644 --- a/web/templates/stranice/servis_predracun.html +++ b/web/templates/stranice/servis_predracun.html @@ -215,7 +215,7 @@
Procena ukupnog troška:
{{if .CenaRaspon}} -
{{printf "%.2f" .UkupnoOd}} – {{dinari .UkupnoDo}} din
+
{{dinari .UkupnoOd}} – {{dinari .UkupnoDo}} din
{{else}}
{{dinari .Ukupno}} din
{{end}} diff --git a/web/templates/stranice/stanje_zaliha.html b/web/templates/stranice/stanje_zaliha.html index 5faee28..cb0582e 100644 --- a/web/templates/stranice/stanje_zaliha.html +++ b/web/templates/stranice/stanje_zaliha.html @@ -58,9 +58,9 @@ {{if .Kategorija}}{{.Kategorija}}{{else}}—{{end}} {{.Kolicina}} {{.KolicinMin}} - {{printf "%.2f" .NabavnaCena}} - {{printf "%.2f" .ProdajnaCena}} - {{printf "%.2f" .VrednostZalihe}} + {{dinari .NabavnaCena}} + {{dinari .ProdajnaCena}} + {{dinari .VrednostZalihe}} {{end}}