PDV pravilo na štampanim dokumentima + fiksni layout + QR popravka
- PDV uslovi (Moduli.pdv) na: predračun, otpremnica, garantni list, prodaja_stampa - Modal za preuzimanje: jedna cena (sa/bez PDV), ne duplo - Javna status stranica: PDV uslovi za cene, predlog, checkbox-ove - Svi print templejti: viewport=device-width+min-width, bez responsive - JavniToken generisan za postojeće naloge bez tokena (QR popravka) - UkupnoSaPdv() metode na ServisniRad i ServisniDeoSaArtiklom - UkupnoBezPdv() na StavkaProdaje
This commit is contained in:
@@ -2,11 +2,11 @@
|
||||
<html lang="sr">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Priznanica {{.Nalog.BrojNaloga}}</title>
|
||||
<style>
|
||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; font-size: 14px; color: #111; background: #f5f5f5; padding: 32px 16px; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; font-size: 14px; color: #111; background: #f5f5f5; padding: 32px 16px; min-width: 640px; }
|
||||
.stranica { background: #fff; max-width: 640px; margin: 0 auto; padding: 40px; border-radius: 8px; box-shadow: 0 1px 8px rgba(0, 0, 0, 0.08); }
|
||||
.zaglavlje { display: flex; justify-content: space-between; align-items: flex-start; margin-bottom: 32px; padding-bottom: 24px; border-bottom: 1px solid #e5e7eb; }
|
||||
.firma-naziv { font-size: 20px; font-weight: 600; color: #111; }
|
||||
@@ -33,7 +33,7 @@
|
||||
.btn { padding: 9px 20px; border-radius: 8px; font-size: 14px; font-weight: 500; cursor: pointer; border: none; text-decoration: none; display: inline-block; }
|
||||
.btn-primarni { background: #2563eb; color: #fff; }
|
||||
.btn-sekundarni { background: #f3f4f6; color: #374151; }
|
||||
@media print { body { background: #fff; padding: 0; } .stranica { box-shadow: none; border-radius: 0; padding: 20px; max-width: 100%; } .ekran-dugmad { display: none; } }
|
||||
@media print { body { background: #fff; padding: 0; } .stranica { box-shadow: none; border-radius: 0; padding: 40px; max-width: 640px; } .ekran-dugmad { display: none; } }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
@@ -73,8 +73,8 @@
|
||||
<tr>
|
||||
<th>Artikal</th>
|
||||
<th>Kol.</th>
|
||||
<th>Cena/kom</th>
|
||||
<th>Ukupno</th>
|
||||
<th>Cena/kom{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
<th>Ukupno{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -82,15 +82,15 @@
|
||||
<tr>
|
||||
<td>{{.ArtikalNaziv}}</td>
|
||||
<td>{{.Kolicina}} {{.JedinicaMere}}</td>
|
||||
<td>{{dinari .CenaPoKomadu}} din</td>
|
||||
<td>{{dinari .Ukupno}} din</td>
|
||||
<td>{{if index $.Moduli "pdv"}}{{dinari .CenaPoKomadu}}{{else}}{{dinari .CenaBezPdv}}{{end}} din</td>
|
||||
<td>{{if index $.Moduli "pdv"}}{{dinari .Ukupno}}{{else}}{{dinari .UkupnoBezPdv}}{{end}} din</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="3" class="ukupno-label">Ukupno za naplatu:</td>
|
||||
<td class="ukupno-iznos">{{dinari .Nalog.Ukupno}} din</td>
|
||||
<td class="ukupno-iznos">{{if index .Moduli "pdv"}}{{dinari .Nalog.Ukupno}}{{else}}{{dinari .UkupnoBezPdv}}{{end}} din</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
@@ -102,10 +102,17 @@
|
||||
<button type="submit" class="premesti-zatvori" aria-label="Zatvori">×</button>
|
||||
</form>
|
||||
<div style="display:flex;flex-direction:column;gap:10px;padding:16px;">
|
||||
{{if index .Moduli "pdv"}}
|
||||
<div style="display:flex;justify-content:space-between;align-items:center;">
|
||||
<span style="color:var(--tekst-sporedni);">Ukupno sa PDV-om</span>
|
||||
<span style="color:var(--tekst-glavni);">{{dinari .UkupnoSveSaPdv}} din</span>
|
||||
</div>
|
||||
{{else}}
|
||||
<div style="display:flex;justify-content:space-between;align-items:center;">
|
||||
<span style="color:var(--tekst-sporedni);">Ukupno</span>
|
||||
<span style="color:var(--tekst-glavni);">{{dinari .UkupnoSve}} din</span>
|
||||
</div>
|
||||
{{end}}
|
||||
{{if gt .Avans 0.0}}
|
||||
<div style="display:flex;justify-content:space-between;align-items:center;">
|
||||
<span style="color:var(--tekst-sporedni);">Avans (uplaćeno)</span>
|
||||
@@ -116,7 +123,7 @@
|
||||
{{end}}
|
||||
<div style="display:flex;justify-content:space-between;align-items:center;margin-top:4px;padding-top:10px;border-top:0.5px solid var(--ivica);">
|
||||
<span style="font-size:16px;font-weight:600;color:var(--tekst-glavni);">Za naplatu</span>
|
||||
<span style="font-size:18px;font-weight:600;color:var(--tekst-glavni);" id="za-naplatu-iznos">{{dinari .PreostaloSve}} din</span>
|
||||
<span style="font-size:18px;font-weight:600;color:var(--tekst-glavni);" id="za-naplatu-iznos">{{if index .Moduli "pdv"}}{{dinari .PreostaloSveSaPdv}}{{else}}{{dinari .PreostaloSve}}{{end}} din</span>
|
||||
</div>
|
||||
<div style="margin-top:10px;padding-top:10px;border-top:0.5px solid var(--ivica);">
|
||||
<label class="polje-labela">Primljeno (din)</label>
|
||||
@@ -129,7 +136,7 @@
|
||||
<form method="POST" action="/servis/{{.Nalog.ID}}/status" data-refresh="#sadrzaj" style="margin-top:8px;">
|
||||
<input type="hidden" name="_csrf" value="{{.CsrfToken}}">
|
||||
<input type="hidden" name="status" value="Preuzeto">
|
||||
<input type="hidden" name="naplaceno" value="{{printf "%.2f" .PreostaloSve}}">
|
||||
<input type="hidden" name="naplaceno" value="{{if index .Moduli "pdv"}}{{printf "%.2f" .PreostaloSveSaPdv}}{{else}}{{printf "%.2f" .PreostaloSve}}{{end}}">
|
||||
<div style="margin-bottom:10px;">
|
||||
<label class="polje-labela">Način plaćanja</label>
|
||||
<select name="nacin_placanja" id="nacin-placanja-sel" style="width:100%;padding:8px 12px;background:var(--pozadina);border:0.5px solid var(--ivica);border-radius:8px;color:var(--tekst-glavni);font-size:13px;" onchange="ntechNacinPlacanjaBroj(this)">
|
||||
@@ -581,7 +588,9 @@
|
||||
<th style="padding:8px 10px;text-align:left;font-size:12px;font-weight:500;color:var(--tekst-sporedni);width:90px;">Šifra</th>
|
||||
<th style="padding:8px 10px;text-align:center;font-size:12px;font-weight:500;color:var(--tekst-sporedni);width:80px;">Kol.</th>
|
||||
<th style="padding:8px 10px;text-align:right;font-size:12px;font-weight:500;color:var(--tekst-sporedni);width:130px;">Cena/kom</th>
|
||||
{{if index .Moduli "pdv"}}<th style="padding:8px 10px;text-align:center;font-size:12px;font-weight:500;color:var(--tekst-sporedni);width:60px;">PDV %</th>{{end}}
|
||||
<th style="padding:8px 10px;text-align:right;font-size:12px;font-weight:500;color:var(--tekst-sporedni);width:130px;">Ukupno</th>
|
||||
{{if index .Moduli "pdv"}}<th style="padding:8px 10px;text-align:right;font-size:12px;font-weight:500;color:var(--tekst-sporedni);width:130px;">Sa PDV</th>{{end}}
|
||||
<th style="width:50px;"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -592,7 +601,9 @@
|
||||
<td style="padding:9px 10px;font-size:12px;color:var(--tekst-sporedni);font-family:monospace;">{{.Sifra}}</td>
|
||||
<td style="padding:9px 10px;text-align:center;font-size:14px;color:var(--tekst-glavni);">{{.Kolicina}}</td>
|
||||
<td style="padding:9px 10px;text-align:right;font-size:14px;color:var(--tekst-glavni);">{{dinari .CenaKomada}} din</td>
|
||||
{{if index $.Moduli "pdv"}}<td style="padding:9px 10px;text-align:center;font-size:12px;color:var(--tekst-sporedni);">{{printf "%.0f" .PdvStopa}}%</td>{{end}}
|
||||
<td style="padding:9px 10px;text-align:right;font-size:14px;font-weight:500;color:var(--tekst-glavni);">{{dinari .Ukupno}} din</td>
|
||||
{{if index $.Moduli "pdv"}}<td style="padding:9px 10px;text-align:right;font-size:14px;font-weight:500;color:var(--tekst-glavni);">{{dinari .CenaSaPdv}} din</td>{{end}}
|
||||
<td style="padding:9px 10px;text-align:center;">
|
||||
{{if and (not $.ZakljucaniUgradjeni) (index $.Dozvole "servis.izmeni")}}
|
||||
<form method="POST" action="/servis/{{$.Nalog.ID}}/radovi/{{.ID}}/obrisi" style="display:inline;" data-refresh="#radovi-blok, #nalog-ukupno, #predlozeno-blok">
|
||||
@@ -613,7 +624,9 @@
|
||||
<td style="padding:9px 10px;font-size:12px;color:var(--tekst-sporedni);font-family:monospace;">{{.Sifra}}</td>
|
||||
<td style="padding:9px 10px;text-align:center;font-size:14px;color:var(--tekst-glavni);">{{.Kolicina}}</td>
|
||||
<td style="padding:9px 10px;text-align:right;font-size:14px;color:var(--tekst-glavni);">{{dinari .CenaKomada}} din</td>
|
||||
{{if index $.Moduli "pdv"}}<td style="padding:9px 10px;text-align:center;font-size:12px;color:var(--tekst-sporedni);">{{printf "%.0f" .PdvStopa}}%</td>{{end}}
|
||||
<td style="padding:9px 10px;text-align:right;font-size:14px;font-weight:500;color:var(--tekst-glavni);">{{dinari .Ukupno}} din</td>
|
||||
{{if index $.Moduli "pdv"}}<td style="padding:9px 10px;text-align:right;font-size:14px;font-weight:500;color:var(--tekst-glavni);">{{dinari .CenaSaPdv}} din</td>{{end}}
|
||||
<td style="padding:9px 10px;text-align:center;">
|
||||
{{if and (index $.Dozvole "servis.izmeni") (ne $.Nalog.Status "U popravci")}}
|
||||
<form method="POST" action="/servis/{{$.Nalog.ID}}/radovi/{{.ID}}/obrisi" style="display:inline;" data-refresh="#radovi-blok, #nalog-ukupno, #predlozeno-blok">
|
||||
@@ -703,7 +716,9 @@
|
||||
<th style="padding:8px 10px;text-align:left;font-size:12px;font-weight:500;color:var(--tekst-sporedni);width:90px;">Šifra</th>
|
||||
<th style="padding:8px 10px;text-align:center;font-size:12px;font-weight:500;color:var(--tekst-sporedni);width:80px;">Kol.</th>
|
||||
<th style="padding:8px 10px;text-align:right;font-size:12px;font-weight:500;color:var(--tekst-sporedni);width:130px;">Cena/kom</th>
|
||||
{{if index .Moduli "pdv"}}<th style="padding:8px 10px;text-align:center;font-size:12px;font-weight:500;color:var(--tekst-sporedni);width:60px;">PDV %</th>{{end}}
|
||||
<th style="padding:8px 10px;text-align:right;font-size:12px;font-weight:500;color:var(--tekst-sporedni);width:130px;">Ukupno</th>
|
||||
{{if index .Moduli "pdv"}}<th style="padding:8px 10px;text-align:right;font-size:12px;font-weight:500;color:var(--tekst-sporedni);width:130px;">Sa PDV</th>{{end}}
|
||||
<th style="width:50px;"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -718,9 +733,13 @@
|
||||
<td style="padding:9px 10px;text-align:right;font-size:14px;color:var(--tekst-glavni);">
|
||||
{{if .Kolicina}}{{dinari .CenaKomada}} din{{else}}—{{end}}
|
||||
</td>
|
||||
{{if index $.Moduli "pdv"}}<td style="padding:9px 10px;text-align:center;font-size:12px;color:var(--tekst-sporedni);">{{printf "%.0f" .PdvStopa}}%</td>{{end}}
|
||||
<td style="padding:9px 10px;text-align:right;font-size:14px;font-weight:500;color:var(--tekst-glavni);">
|
||||
{{if .Kolicina}}{{dinari .Ukupno}} din{{else}}—{{end}}
|
||||
</td>
|
||||
{{if index $.Moduli "pdv"}}<td style="padding:9px 10px;text-align:right;font-size:14px;font-weight:500;color:var(--tekst-glavni);">
|
||||
{{if .Kolicina}}{{dinari .CenaSaPdv}} din{{else}}—{{end}}
|
||||
</td>{{end}}
|
||||
<td style="padding:9px 10px;text-align:center;">
|
||||
{{if and (not $.ZakljucaniUgradjeni) (index $.Dozvole "servis.izmeni")}}
|
||||
<form method="POST" action="/servis/{{$.Nalog.ID}}/delovi/{{.ID}}/obrisi" style="display:inline;" data-refresh="#delovi-blok, #nalog-zaglavlje, #nalog-ukupno, #predlozeno-blok">
|
||||
@@ -745,9 +764,13 @@
|
||||
<td style="padding:9px 10px;text-align:right;font-size:14px;color:var(--tekst-glavni);">
|
||||
{{if .Kolicina}}{{dinari .CenaKomada}} din{{else}}—{{end}}
|
||||
</td>
|
||||
{{if index $.Moduli "pdv"}}<td style="padding:9px 10px;text-align:center;font-size:12px;color:var(--tekst-sporedni);">{{printf "%.0f" .PdvStopa}}%</td>{{end}}
|
||||
<td style="padding:9px 10px;text-align:right;font-size:14px;font-weight:500;color:var(--tekst-glavni);">
|
||||
{{if .Kolicina}}{{dinari .Ukupno}} din{{else}}—{{end}}
|
||||
</td>
|
||||
{{if index $.Moduli "pdv"}}<td style="padding:9px 10px;text-align:right;font-size:14px;font-weight:500;color:var(--tekst-glavni);">
|
||||
{{if .Kolicina}}{{dinari .CenaSaPdv}} din{{else}}—{{end}}
|
||||
</td>{{end}}
|
||||
<td style="padding:9px 10px;text-align:center;">
|
||||
{{if and (index $.Dozvole "servis.izmeni") (ne $.Nalog.Status "U popravci")}}
|
||||
{{if .ID}}
|
||||
@@ -903,20 +926,41 @@
|
||||
</div>
|
||||
{{end}}
|
||||
{{else}}
|
||||
{{if index .Moduli "pdv"}}
|
||||
<div style="display:flex;justify-content:space-between;align-items:center;">
|
||||
<span style="font-size:14px;color:var(--tekst-sporedni);">Usluge (rad) sa PDV-om</span>
|
||||
<span style="font-size:14px;color:var(--tekst-glavni);">{{dinari .UkupnoRadoviSaPdv}} din</span>
|
||||
</div>
|
||||
{{else}}
|
||||
<div style="display:flex;justify-content:space-between;align-items:center;">
|
||||
<span style="font-size:14px;color:var(--tekst-sporedni);">Usluge (rad)</span>
|
||||
<span style="font-size:14px;color:var(--tekst-glavni);">{{dinari .UkupnoRadovi}} din</span>
|
||||
</div>
|
||||
{{end}}
|
||||
{{if index .Moduli "pdv"}}
|
||||
<div style="display:flex;justify-content:space-between;align-items:center;">
|
||||
<span style="font-size:14px;color:var(--tekst-sporedni);">Ugrađeni delovi sa PDV-om</span>
|
||||
<span style="font-size:14px;color:var(--tekst-glavni);">{{dinari .UkupnoDeloviSaPdv}} din</span>
|
||||
</div>
|
||||
{{else}}
|
||||
<div style="display:flex;justify-content:space-between;align-items:center;">
|
||||
<span style="font-size:14px;color:var(--tekst-sporedni);">Ugrađeni delovi</span>
|
||||
<span style="font-size:14px;color:var(--tekst-glavni);">{{dinari .UkupnoDelovi}} din</span>
|
||||
</div>
|
||||
{{end}}
|
||||
{{end}}
|
||||
{{end}}
|
||||
{{if index .Moduli "pdv"}}
|
||||
<div style="display:flex;justify-content:space-between;align-items:center;margin-top:4px;">
|
||||
<span style="font-size:16px;font-weight:700;color:var(--tekst-glavni);">UKUPNO sa PDV-om</span>
|
||||
<span style="font-size:20px;font-weight:700;color:var(--tekst-glavni);">{{dinari .UkupnoSveSaPdv}} din</span>
|
||||
</div>
|
||||
{{else}}
|
||||
<div style="display:flex;justify-content:space-between;align-items:center;margin-top:8px;padding-top:14px;border-top:1px solid var(--ivica);">
|
||||
<span style="font-size:16px;font-weight:700;color:var(--tekst-glavni);">UKUPNO</span>
|
||||
<span style="font-size:20px;font-weight:700;color:var(--tekst-glavni);">{{dinari .UkupnoSve}} din</span>
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<title>Garantni list — {{.Nalog.BrojNaloga}}</title>
|
||||
<style>
|
||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Arial, sans-serif; font-size: 13px; color: #111; background: #fff; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Arial, sans-serif; font-size: 13px; color: #111; background: #fff; min-width: 780px; }
|
||||
|
||||
.strana { max-width: 780px; margin: 0 auto; padding: 32px 40px; }
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
|
||||
@media print {
|
||||
body { font-size: 12px; }
|
||||
.strana { padding: 16px 20px; max-width: 100%; }
|
||||
.strana { padding: 32px 40px; max-width: 780px; }
|
||||
.dugme-stampa { display: none !important; }
|
||||
@page { size: A4; margin: 12mm 14mm; }
|
||||
}
|
||||
@@ -153,8 +153,8 @@
|
||||
<tr>
|
||||
<th>Opis rada</th>
|
||||
<th>Kol.</th>
|
||||
<th>Cena</th>
|
||||
<th>Ukupno</th>
|
||||
<th>Cena{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
<th>Ukupno{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -162,8 +162,8 @@
|
||||
<tr>
|
||||
<td>{{.Naziv}}</td>
|
||||
<td style="text-align:right;">{{printf "%.0f" .Kolicina}}</td>
|
||||
<td style="text-align:right;">{{dinari .CenaKomada}}</td>
|
||||
<td>{{dinari .Ukupno}}</td>
|
||||
<td style="text-align:right;">{{if index $.Moduli "pdv"}}{{dinari .CenaSaPdv}}{{else}}{{dinari .CenaKomada}}{{end}}</td>
|
||||
<td>{{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}}{{else}}{{dinari .Ukupno}}{{end}}</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
@@ -183,8 +183,8 @@
|
||||
<th>Naziv</th>
|
||||
<th>Šifra</th>
|
||||
<th>Kol.</th>
|
||||
<th>Cena</th>
|
||||
<th>Ukupno</th>
|
||||
<th>Cena{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
<th>Ukupno{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -194,8 +194,8 @@
|
||||
<td>{{.ArtikalNaziv}}</td>
|
||||
<td style="font-family:monospace;">{{.ArtikalSifra}}</td>
|
||||
<td style="text-align:right;">{{.Kolicina}}</td>
|
||||
<td style="text-align:right;">{{dinari .CenaKomada}}</td>
|
||||
<td>{{dinari .Ukupno}}</td>
|
||||
<td style="text-align:right;">{{if index $.Moduli "pdv"}}{{dinari .CenaSaPdv}}{{else}}{{dinari .CenaKomada}}{{end}}</td>
|
||||
<td>{{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}}{{else}}{{dinari .Ukupno}}{{end}}</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
{{end}}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<title>Nalepnica — {{.Nalog.BrojNaloga}}</title>
|
||||
<style>
|
||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
html, body { background: #f4f4f5; }
|
||||
html, body { background: #f4f4f5; min-width: 70mm; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Arial, sans-serif; color: #111; }
|
||||
|
||||
/* nalepnica 70×40 mm */
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<title>Otpremnica — {{.Nalog.BrojNaloga}}</title>
|
||||
<style>
|
||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Arial, sans-serif; font-size: 13px; color: #111; background: #fff; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Arial, sans-serif; font-size: 13px; color: #111; background: #fff; min-width: 780px; }
|
||||
|
||||
.strana { max-width: 780px; margin: 0 auto; padding: 32px 40px; }
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
@media print {
|
||||
body { font-size: 12px; }
|
||||
.strana { padding: 16px 20px; max-width: 100%; }
|
||||
.strana { padding: 32px 40px; max-width: 780px; }
|
||||
.dugme-stampa { display: none !important; }
|
||||
@page { size: A4; margin: 12mm 14mm; }
|
||||
/* red tabele se ne sme prelomiti preko granice stranice — prelom pada između stavki */
|
||||
@@ -177,8 +177,8 @@
|
||||
<tr>
|
||||
<th>Opis rada</th>
|
||||
<th class="desno" style="width:70px;">Kol.</th>
|
||||
<th class="desno" style="width:120px;">Cena/kom</th>
|
||||
<th class="desno" style="width:120px;">Ukupno</th>
|
||||
<th class="desno" style="width:120px;">Cena/kom{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
<th class="desno" style="width:120px;">Ukupno{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -186,8 +186,8 @@
|
||||
<tr>
|
||||
<td>{{.Naziv}}</td>
|
||||
<td class="desno">{{printf "%.0f" .Kolicina}}</td>
|
||||
<td class="desno">{{dinari .CenaKomada}} din</td>
|
||||
<td class="desno">{{dinari .Ukupno}} din</td>
|
||||
<td class="desno">{{if index $.Moduli "pdv"}}{{dinari .CenaSaPdv}}{{else}}{{dinari .CenaKomada}}{{end}} din</td>
|
||||
<td class="desno">{{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}}{{else}}{{dinari .Ukupno}}{{end}} din</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
@@ -204,8 +204,8 @@
|
||||
<tr>
|
||||
<th>Artikal</th>
|
||||
<th class="desno" style="width:70px;">Kol.</th>
|
||||
<th class="desno" style="width:120px;">Cena/kom</th>
|
||||
<th class="desno" style="width:120px;">Ukupno</th>
|
||||
<th class="desno" style="width:120px;">Cena/kom{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
<th class="desno" style="width:120px;">Ukupno{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -213,13 +213,13 @@
|
||||
<tr>
|
||||
<td>{{.ArtikalNaziv}}</td>
|
||||
<td class="desno">{{.Kolicina}}</td>
|
||||
<td class="desno">{{dinari .CenaKomada}} din</td>
|
||||
<td class="desno">{{dinari .Ukupno}} din</td>
|
||||
<td class="desno">{{if index $.Moduli "pdv"}}{{dinari .CenaSaPdv}}{{else}}{{dinari .CenaKomada}}{{end}} din</td>
|
||||
<td class="desno">{{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}}{{else}}{{dinari .Ukupno}}{{end}} din</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
<tr class="ukupno-red">
|
||||
<td colspan="3">Ukupno delovi</td>
|
||||
<td class="desno">{{dinari .UkupnoDelovi}} din</td>
|
||||
<td class="desno">{{if index .Moduli "pdv"}}{{dinari .UkupnoDeloviSaPdv}}{{else}}{{dinari .UkupnoDelovi}}{{end}} din</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -246,7 +246,7 @@
|
||||
</table>
|
||||
<div class="naplata-blok">
|
||||
<div class="naplata-labela">Za naplatu pri preuzimanju:</div>
|
||||
<div class="naplata-iznos">{{dinari .PreostaloSve}} din</div>
|
||||
<div class="naplata-iznos">{{if index .Moduli "pdv"}}{{dinari .PreostaloSveSaPdv}}{{else}}{{dinari .PreostaloSve}}{{end}} din</div>
|
||||
</div>
|
||||
</div>
|
||||
{{else if .Nalog.CenaKonacna}}
|
||||
@@ -261,7 +261,7 @@
|
||||
{{if gt .UkupnoDelovi 0.0}}
|
||||
<tr>
|
||||
<td>Ugrađeni delovi i materijal</td>
|
||||
<td class="desno">{{dinari .UkupnoDelovi}} din</td>
|
||||
<td class="desno">{{if index .Moduli "pdv"}}{{dinari .UkupnoDeloviSaPdv}}{{else}}{{dinari .UkupnoDelovi}}{{end}} din</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
{{if .ImaAvans}}
|
||||
@@ -274,7 +274,7 @@
|
||||
</table>
|
||||
<div class="naplata-blok">
|
||||
<div class="naplata-labela">Za naplatu pri preuzimanju:</div>
|
||||
<div class="naplata-iznos">{{dinari .PreostaloSve}} din</div>
|
||||
<div class="naplata-iznos">{{if index .Moduli "pdv"}}{{dinari .PreostaloSveSaPdv}}{{else}}{{dinari .PreostaloSve}}{{end}} din</div>
|
||||
</div>
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<title>Predračun — {{.Nalog.BrojNaloga}}</title>
|
||||
<style>
|
||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Arial, sans-serif; font-size: 13px; color: #111; background: #fff; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Arial, sans-serif; font-size: 13px; color: #111; background: #fff; min-width: 780px; }
|
||||
|
||||
.strana { max-width: 780px; margin: 0 auto; padding: 32px 40px; }
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
|
||||
@media print {
|
||||
body { font-size: 12px; }
|
||||
.strana { padding: 16px 20px; max-width: 100%; }
|
||||
.strana { padding: 32px 40px; max-width: 780px; }
|
||||
.dugme-stampa { display: none !important; }
|
||||
@page { size: A4; margin: 12mm 14mm; }
|
||||
.tabela tr { break-inside: avoid; }
|
||||
@@ -152,8 +152,8 @@
|
||||
<tr>
|
||||
<th>Usluga</th>
|
||||
<th class="desno" style="width:70px;">Kol.</th>
|
||||
<th class="desno" style="width:120px;">Cena</th>
|
||||
<th class="desno" style="width:120px;">Ukupno</th>
|
||||
<th class="desno" style="width:120px;">Cena{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
<th class="desno" style="width:120px;">Ukupno{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -161,8 +161,8 @@
|
||||
<tr>
|
||||
<td>{{.Naziv}}</td>
|
||||
<td class="desno">{{.Kolicina}}</td>
|
||||
<td class="desno">{{dinari .CenaKomada}} din</td>
|
||||
<td class="desno">{{dinari .Ukupno}} din</td>
|
||||
<td class="desno">{{if index $.Moduli "pdv"}}{{dinari .CenaSaPdv}}{{else}}{{dinari .CenaKomada}}{{end}} din</td>
|
||||
<td class="desno">{{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}}{{else}}{{dinari .Ukupno}}{{end}} din</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
@@ -179,8 +179,8 @@
|
||||
<tr>
|
||||
<th>Artikal</th>
|
||||
<th class="desno" style="width:70px;">Kol.</th>
|
||||
<th class="desno" style="width:120px;">Cena/kom</th>
|
||||
<th class="desno" style="width:120px;">Ukupno</th>
|
||||
<th class="desno" style="width:120px;">Cena/kom{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
<th class="desno" style="width:120px;">Ukupno{{if index .Moduli "pdv"}} sa PDV{{end}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -188,8 +188,8 @@
|
||||
<tr>
|
||||
<td>{{.ArtikalNaziv}}</td>
|
||||
<td class="desno">{{.Kolicina}}</td>
|
||||
<td class="desno">{{dinari .CenaKomada}} din</td>
|
||||
<td class="desno">{{dinari .Ukupno}} din</td>
|
||||
<td class="desno">{{if index $.Moduli "pdv"}}{{dinari .CenaSaPdv}}{{else}}{{dinari .CenaKomada}}{{end}} din</td>
|
||||
<td class="desno">{{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}}{{else}}{{dinari .Ukupno}}{{end}} din</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
@@ -208,11 +208,11 @@
|
||||
|
||||
<!-- rekapitulacija: ponavlja sume po sekciji (korisno kad tabele pređu na prethodnu stranu) -->
|
||||
<div class="rekap">
|
||||
{{if .Radovi}}<div class="rekap-red" style="font-weight:600;"><span>Ukupno radovi</span><span>{{dinari .UkupnoRad}} din</span></div>{{end}}
|
||||
{{if .ServisniDelovi}}<div class="rekap-red" style="font-weight:600;"><span>Ukupno delovi</span><span>{{dinari .UkupnoDelovi}} din</span></div>{{end}}
|
||||
{{if .Radovi}}<div class="rekap-red" style="font-weight:600;"><span>Ukupno radovi</span><span>{{if index .Moduli "pdv"}}{{dinari .UkupnoRadSaPdv}}{{else}}{{dinari .UkupnoRad}}{{end}} din</span></div>{{end}}
|
||||
{{if .ServisniDelovi}}<div class="rekap-red" style="font-weight:600;"><span>Ukupno delovi</span><span>{{if index .Moduli "pdv"}}{{dinari .UkupnoDeloviSaPdv}}{{else}}{{dinari .UkupnoDelovi}}{{end}} din</span></div>{{end}}
|
||||
<div class="rekap-ukupno">
|
||||
<div class="rekap-ukupno-labela">Ukupno (procena):</div>
|
||||
<div class="rekap-ukupno-iznos">{{dinari .UkupnoSve}} din</div>
|
||||
<div class="rekap-ukupno-iznos">{{if index .Moduli "pdv"}}{{dinari .UkupnoSveSaPdv}}{{else}}{{dinari .UkupnoSve}}{{end}} din</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<title>Radni nalog {{.Nalog.BrojNaloga}}</title>
|
||||
<style>
|
||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Arial, sans-serif; font-size: 13px; color: #111; background: #fff; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Arial, sans-serif; font-size: 13px; color: #111; background: #fff; min-width: 780px; }
|
||||
|
||||
.strana { max-width: 780px; margin: 0 auto; padding: 32px 40px; }
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
|
||||
@media print {
|
||||
body { font-size: 12px; }
|
||||
.strana { padding: 12px 16px; max-width: 100%; }
|
||||
.strana { padding: 32px 40px; max-width: 780px; }
|
||||
.dugme-stampa { display: none !important; }
|
||||
@page { size: A4; margin: 8mm 10mm; }
|
||||
.odeljak { margin-bottom: 10px; }
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<title>Revers — {{.Nalog.BrojNaloga}}</title>
|
||||
<style>
|
||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Arial, sans-serif; font-size: 13px; color: #111; background: #fff; }
|
||||
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Arial, sans-serif; font-size: 13px; color: #111; background: #fff; min-width: 780px; }
|
||||
|
||||
.strana { max-width: 780px; margin: 0 auto; padding: 32px 40px; }
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
@page { size: A4; margin: 12mm 14mm 18mm; }
|
||||
@media print {
|
||||
body { font-size: 12px; }
|
||||
.strana { padding: 16px 20px; max-width: 100%; }
|
||||
.strana { padding: 32px 40px; max-width: 780px; }
|
||||
.dugme-stampa { display: none !important; }
|
||||
/* uslovi servisa (sa potpisima) idu na novu stranicu */
|
||||
.uslovi-strana { break-before: page; }
|
||||
|
||||
@@ -243,26 +243,26 @@
|
||||
{{range .Radovi}}
|
||||
<div class="red">
|
||||
<span class="red-labela">{{.Naziv}}{{if gt .Kolicina 1.0}} ×{{.Kolicina}}{{end}}</span>
|
||||
<span class="red-vrednost">{{dinari .Ukupno}} din</span>
|
||||
<span class="red-vrednost">{{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}}{{else}}{{dinari .Ukupno}}{{end}} din</span>
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
{{range .ServisniDelovi}}
|
||||
<div class="red">
|
||||
<span class="red-labela">{{.ArtikalNaziv}}{{if gt .Kolicina 1}} ×{{.Kolicina}}{{end}}</span>
|
||||
<span class="red-vrednost">{{dinari .Ukupno}} din</span>
|
||||
<span class="red-vrednost">{{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}}{{else}}{{dinari .Ukupno}}{{end}} din</span>
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
<div class="cena-blok" style="margin-top:12px;display:flex;justify-content:space-between;align-items:center;">
|
||||
<span class="cena-labela" style="margin:0;">Ukupno (procena)</span>
|
||||
<span class="cena-vrednost">{{dinari .UkupnoSve}} din</span>
|
||||
<span class="cena-vrednost">{{if index .Moduli "pdv"}}{{dinari .UkupnoSveSaPdv}}{{else}}{{dinari .UkupnoSve}}{{end}} din</span>
|
||||
</div>
|
||||
|
||||
{{if .ImaPredlog}}
|
||||
<div class="cena-blok" style="margin-top:8px;padding:10px 14px;display:flex;justify-content:space-between;align-items:center;background:#0f172a;border:1px solid #f59e0b;border-radius:8px;">
|
||||
<span class="cena-labela" style="margin:0;color:#fbbf24;">Sa predlogom</span>
|
||||
<span class="cena-vrednost" id="sa-predlogom-zbir" data-base="{{printf "%.2f" .UkupnoSve}}" style="font-size:16px;font-weight:700;color:#fbbf24;">{{dinari .UkupnoSaPredlogom}} din</span>
|
||||
<span class="cena-vrednost" id="sa-predlogom-zbir" data-base="{{if index .Moduli "pdv"}}{{printf "%.2f" .UkupnoSveSaPdv}}{{else}}{{printf "%.2f" .UkupnoSve}}{{end}}" style="font-size:16px;font-weight:700;color:#fbbf24;">{{if index .Moduli "pdv"}}{{dinari .UkupnoSaPredlogomSaPdv}}{{else}}{{dinari .UkupnoSaPredlogom}}{{end}} din</span>
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
@@ -286,11 +286,11 @@
|
||||
{{range .PredlozeniRadovi}}
|
||||
<label style="display:flex;align-items:center;justify-content:space-between;gap:10px;padding:8px 0;border-bottom:0.5px solid #1e293b;cursor:pointer;">
|
||||
<span style="display:flex;align-items:center;gap:10px;flex:1;">
|
||||
<input type="checkbox" name="rad_id" value="{{.ID}}" checked data-iznos="{{printf "%.2f" .Ukupno}}"
|
||||
<input type="checkbox" name="rad_id" value="{{.ID}}" checked data-iznos="{{if index $.Moduli "pdv"}}{{printf "%.2f" .UkupnoSaPdv}}{{else}}{{printf "%.2f" .Ukupno}}{{end}}"
|
||||
style="width:18px;height:18px;accent-color:#f59e0b;flex-shrink:0;">
|
||||
<span style="font-size:13px;color:#e2e8f0;">{{.Naziv}}{{if gt .Kolicina 1.0}} × {{printf "%.0f" .Kolicina}}{{end}}</span>
|
||||
</span>
|
||||
<span style="font-size:13px;font-weight:600;color:#fbbf24;white-space:nowrap;">{{dinari .Ukupno}} din</span>
|
||||
<span style="font-size:13px;font-weight:600;color:#fbbf24;white-space:nowrap;">{{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}}{{else}}{{dinari .Ukupno}}{{end}} din</span>
|
||||
</label>
|
||||
{{end}}
|
||||
{{end}}
|
||||
@@ -300,18 +300,18 @@
|
||||
{{range .PredlozeniDelovi}}
|
||||
<label style="display:flex;align-items:center;justify-content:space-between;gap:10px;padding:8px 0;border-bottom:0.5px solid #1e293b;cursor:pointer;">
|
||||
<span style="display:flex;align-items:center;gap:10px;flex:1;">
|
||||
<input type="checkbox" name="artikal_id" value="{{.ArtikalID}}" checked data-iznos="{{printf "%.2f" .Ukupno}}"
|
||||
<input type="checkbox" name="artikal_id" value="{{.ArtikalID}}" checked data-iznos="{{if index $.Moduli "pdv"}}{{printf "%.2f" .UkupnoSaPdv}}{{else}}{{printf "%.2f" .Ukupno}}{{end}}"
|
||||
style="width:18px;height:18px;accent-color:#f59e0b;flex-shrink:0;">
|
||||
<span style="font-size:13px;color:#e2e8f0;">{{.ArtikalNaziv}}{{if gt .Kolicina 1}} × {{.Kolicina}}{{end}}</span>
|
||||
</span>
|
||||
<span style="font-size:13px;font-weight:600;color:#fbbf24;white-space:nowrap;">{{dinari .Ukupno}} din</span>
|
||||
<span style="font-size:13px;font-weight:600;color:#fbbf24;white-space:nowrap;">{{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}}{{else}}{{dinari .Ukupno}}{{end}} din</span>
|
||||
</label>
|
||||
{{end}}
|
||||
{{end}}
|
||||
|
||||
<div class="cena-blok predlog-ukupno" style="margin-top:12px;display:flex;justify-content:space-between;align-items:center;">
|
||||
<span class="cena-labela" style="margin:0;">Predlog ukupno</span>
|
||||
<span class="cena-vrednost" id="predlog-zbir">{{dinari .UkupnoPredlog}} din</span>
|
||||
<span class="cena-vrednost" id="predlog-zbir">{{if index .Moduli "pdv"}}{{dinari .UkupnoPredlogSaPdv}}{{else}}{{dinari .UkupnoPredlog}}{{end}} din</span>
|
||||
</div>
|
||||
|
||||
<textarea name="komentar" placeholder="Poruka serviseru (opciono)..." rows="2"
|
||||
|
||||
Reference in New Issue
Block a user