11 Commits

Author SHA1 Message Date
pero1203
41d86001d6 Prenos vseh globalnih spremenljivk v settings_optional.php v bazo 2021-09-29 10:37:17 +02:00
pero1203
393bf48aaf Merge branch 'master' into release/produkcija
# Conflicts:
#	.gitignore
#	composer.lock
#	resources/sass/admin/branching/branching_collapsed.scss
#	resources/sass/admin/branching/branching_expanded.scss
#	resources/sass/admin/branching/form.scss
#	resources/sass/admin/branching/voting.scss
#	resources/sass/admin/footer.scss
#	resources/sass/admin/icons/standard.scss
#	resources/sass/admin/main_page/survey_list.scss
#	resources/sass/admin/media.scss
#	resources/sass/admin/popup/basic.scss
#	resources/sass/admin/popup/popup.scss
#	resources/sass/admin/users.scss
#	resources/sass/main/main/admin.scss
#	resources/sass/main/main_mobile/content.scss
#	vendor/autoload.php
#	vendor/composer/autoload_files.php
#	vendor/composer/autoload_real.php
#	vendor/composer/autoload_static.php
#	vendor/composer/installed.json
2021-03-06 17:20:12 +01:00
pero1203
59ba8b3932 Popravljeno storniranje placila - usvari se novo placilo z negativnim zneskom 2021-02-03 10:48:20 +01:00
pero1203
18fd9a5f3f Skrit gumb za rocno dodajanje novega placila - tega ni vec 2021-02-01 12:54:42 +01:00
pero1203
0da6b81046 Moznost "placaj eracun" pri narocilih - izda racun z rokom 30 dni (neplacan) in ustvari placilo 2021-02-01 12:45:19 +01:00
pero1203
c2295ec15b Popravek cen - pred 7.12 se morajo upostevati stare 2020-12-07 11:07:54 +01:00
pero1203
4595f7abdf Popravek izpisa predracuna - preko ajax-a namesto preko api-ja 2020-12-05 11:51:24 +01:00
pero1203
0b52faf12d Dodani stolpci v tabeli placil 2020-12-05 11:30:03 +01:00
pero1203
b2980fcd51 Mobile datatables za narocila in placila, nastavljen meta viewport v admin vmesniku, da mobile ne scale-a 2020-09-23 10:25:59 +02:00
pero1203
7e7602a495 Dodana moznost za storniranje placila 2020-09-11 09:53:35 +02:00
pero1203
0fa9693bf9 Dodan nov repozitorij 2020-08-14 13:36:36 +02:00