Merge branch 'fix-small-issues' into 'master'
fixed small issues See merge request JustScreaMy/facturio!6
This commit is contained in:
commit
b21c828f2e
4 changed files with 12 additions and 5 deletions
|
@ -108,7 +108,7 @@ msgstr "Jméno"
|
||||||
|
|
||||||
#: subjects/models.py:23 subjects/templates/subjects/index.html:13
|
#: subjects/models.py:23 subjects/templates/subjects/index.html:13
|
||||||
msgid "VAT ID"
|
msgid "VAT ID"
|
||||||
msgstr "IČO"
|
msgstr "DIČ"
|
||||||
|
|
||||||
#: subjects/models.py:30 subjects/templates/subjects/index.html:14
|
#: subjects/models.py:30 subjects/templates/subjects/index.html:14
|
||||||
msgid "Street"
|
msgid "Street"
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ subject.id }}</td>
|
<td>{{ subject.id }}</td>
|
||||||
<td>{{ subject.name }}</td>
|
<td>{{ subject.name }}</td>
|
||||||
<td>{{ subject.vat_id }}</td>
|
<td>{{ subject.vat_id|default:_("None")}}</td>
|
||||||
<td>{{ subject.street }}</td>
|
<td>{{ subject.street }}</td>
|
||||||
<td>{{ subject.zip_code }}</td>
|
<td>{{ subject.zip_code }}</td>
|
||||||
<td>{{ subject.city }}</td>
|
<td>{{ subject.city }}</td>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
|
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
|
<nav class="navbar navbar-expand-md navbar-dark bg-primary">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<a class="navbar-brand" href="{% url "main-page" %}">Facturio</a>
|
<a class="navbar-brand" href="{% url "main-page" %}">Facturio</a>
|
||||||
{% if request.user.is_authenticated %}
|
{% if request.user.is_authenticated %}
|
||||||
|
|
|
@ -11,8 +11,15 @@ if [[ ! -f "manage.py" ]]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Compiling messages!"
|
echo "Compiling messages..."
|
||||||
./manage.py compilemessages >/dev/null
|
./manage.py compilemessages >/dev/null
|
||||||
|
|
||||||
echo "Migrating"
|
echo "Migrating..."
|
||||||
./manage.py migrate >/dev/null
|
./manage.py migrate >/dev/null
|
||||||
|
|
||||||
|
if [[ -z "$ENVIRONMENT" ]]; then
|
||||||
|
./manage.py runserver
|
||||||
|
else
|
||||||
|
echo 'Production use is not ready yet!!'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
Reference in a new issue