Dasko/GoNtech
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge feature/knjigovodstvo: knjigovodstveni modul

Browse Source 
Profil firme i moduli, PDV evidencija (KIR/KPR) sa auto-punjenjem, PDV obračun + PP-PDV,
uvoz robe (006/106), šifarnik PDV stopa, kalkulacija prodajne cene (marža po
kategoriji/artiklu, zavisni troškovi, dvosmerni izračun) i nivelacija uz trag.

# Conflicts:
#	web/templates/stranice/magacin.html
#	web/templates/stranice/nabavka_forma.html
This commit is contained in:
Dalibor Marković
2026-06-14 17:49:33 +02:00
parent cbc25ad1f7 fc2743e98d
commit 8b949e1fb9
70 changed files with 4640 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/templates/stranice/magacin.html
+29 -1
View File
@@ -83,6 +83,7 @@
<a href="/magacin/izmeni/{{.ID}}" class="btn-primarno-malo">
Izmeni
</a>
{{template "promeniCenuMeni" (dict "ID" .ID "Cena" .ProdajnaCena)}}
{{end}}
{{if index $.Dozvole "artikal.premesti"}}{{if $.Kategorije}}
{{template "premestiMeni" (dict "ID" .ID "Kategorije" $.Kategorije "Prefiks" "tab")}}
@@ -112,7 +113,7 @@
<div class="magacin-kartice">
{{range .Artikli}}
<div class="kartica magacin-kartica animiraj">
<div class="red-izmedju" style="align-items:flex-start;gap:12px;margin-bottom:10px;">
<div class="red-izmedju" style="align-items:flex-start;gap:12px;margin-bottom:10px;flex-wrap:wrap;">
<div>
<div style="font-size:15px;font-weight:500;color:var(--tekst-glavni);">{{.Naziv}}</div>
{{if .KategorijaNaziv}}
@@ -122,6 +123,7 @@
<div style="display:flex;gap:8px;flex-shrink:0;flex-wrap:wrap;justify-content:flex-end;">
{{if index $.Dozvole "artikal.izmeni"}}
<a href="/magacin/izmeni/{{.ID}}" class="btn-primarno-malo">Izmeni</a>
{{template "promeniCenuMeni" (dict "ID" .ID "Cena" .ProdajnaCena)}}
{{end}}
{{if index $.Dozvole "artikal.premesti"}}{{if $.Kategorije}}
{{template "premestiMeni" (dict "ID" .ID "Kategorije" $.Kategorije "Prefiks" "kart")}}
@@ -179,3 +181,29 @@
</form>
</dialog>
{{end}}
{{define "promeniCenuMeni"}}
<button type="button" class="btn-primarno-malo" style="align-self:center;"
onclick="this.nextElementSibling.showModal()">Promeni cenu</button>
{{/* nativni modal — isti obrazac kao premesti (top layer, centriran) */}}
<dialog id="cena-{{.ID}}" class="premesti-modal" onclick="if(event.target===this)this.close()">
<form method="dialog" class="premesti-zaglavlje">
<h3>Promeni prodajnu cenu</h3>
<button type="submit" class="premesti-zatvori" aria-label="Zatvori">&times;</button>
</form>
<form method="POST" action="/magacin/promeni-cenu/{{.ID}}" style="display:flex;flex-direction:column;gap:12px;padding:16px;">
<div style="font-size:13px;color:var(--tekst-sporedni);">Trenutna cena: <strong>{{printf "%.0f" .Cena}} din</strong></div>
<div>
<label class="polje-labela">Nova cena (din)</label>
<input type="number" name="nova_cena" min="0" step="0.01" value="{{printf "%.2f" .Cena}}" required
style="width:100%;padding:8px 12px;border:0.5px solid var(--ivica);border-radius:8px;font-size:14px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
</div>
<div>
<label class="polje-labela">Razlog (opciono)</label>
<input type="text" name="razlog" placeholder="npr. promena nabavne cene"
style="width:100%;padding:8px 12px;border:0.5px solid var(--ivica);border-radius:8px;font-size:14px;background:var(--pozadina);color:var(--tekst-glavni);outline:none;">
</div>
<button type="submit" class="btn-primarno" style="align-self:flex-end;">Sačuvaj cenu</button>
</form>
</dialog>
{{end}}