update
This commit is contained in:
parent
e3122a4a29
commit
48370d75c1
BIN
db1.sqlite3
Normal file
BIN
db1.sqlite3
Normal file
Binary file not shown.
@ -75,9 +75,9 @@ from django.urls import reverse, reverse_lazy
|
||||
from django.contrib import messages
|
||||
from django.db.models import Sum, F, Count
|
||||
from django.db import transaction
|
||||
from two_factor.utils import default_device
|
||||
# from two_factor.utils import default_device
|
||||
|
||||
from two_factor.views import OTPRequiredMixin
|
||||
# from two_factor.views import OTPRequiredMixin
|
||||
|
||||
from .forms import VendorForm
|
||||
from .services import (
|
||||
|
||||
@ -51,38 +51,18 @@
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"
|
||||
integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g=="
|
||||
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
|
||||
|
||||
|
||||
|
||||
{% block customCSS %}
|
||||
{% endblock %}
|
||||
</head>
|
||||
<body>
|
||||
<main class="main" id="top">
|
||||
{% include 'header.html' %}
|
||||
<<<<<<< HEAD
|
||||
<div class="content">
|
||||
{% block period_navigation %}{% endblock period_navigation %}
|
||||
{% block content %}{% endblock content%}
|
||||
{% block body %}{% endblock body%}
|
||||
{% include 'footer.html' %}
|
||||
</div>
|
||||
=======
|
||||
<div class="content">
|
||||
|
||||
{% block period_navigation %}
|
||||
|
||||
{% endblock period_navigation %}
|
||||
|
||||
{% block content %}
|
||||
{% endblock content%}
|
||||
{% block body %}
|
||||
{% endblock body%}
|
||||
|
||||
|
||||
{% include 'footer.html' %}
|
||||
</div>
|
||||
>>>>>>> a4433631fb8ac35fdea38581ddea53fbba7115e4
|
||||
</main>
|
||||
{% block customJS %}
|
||||
<script src="{% static 'django_ledger/bundle/djetler.bundle.js' %}"></script>
|
||||
|
||||
@ -181,7 +181,7 @@
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content mt-15 rounded-pill">
|
||||
<div class="modal-body p-0">
|
||||
<div class="search-box navbar-top-search-box" data-list='{"valueNames":["title"]}' style="width: auto;">
|
||||
<div class="search-box navbar-top-search-box" style="width: auto;">
|
||||
<form class="position-relative" data-bs-toggle="search" data-bs-display="static">
|
||||
<input class="form-control search-input fuzzy-search rounded-pill form-control-lg" type="search" placeholder="Search..." aria-label="Search" />
|
||||
<span class="fas fa-search search-box-icon"></span>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user