diff --git a/db1.sqlite3 b/db1.sqlite3 new file mode 100644 index 00000000..d1a82d18 Binary files /dev/null and b/db1.sqlite3 differ diff --git a/inventory/views.py b/inventory/views.py index 9dd40766..1405f3d3 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -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 ( diff --git a/templates/base.html b/templates/base.html index 6dc55880..074118e2 100644 --- a/templates/base.html +++ b/templates/base.html @@ -51,38 +51,18 @@ - - - {% block customCSS %} {% endblock %}
{% include 'header.html' %} -<<<<<<< HEAD
{% block period_navigation %}{% endblock period_navigation %} {% block content %}{% endblock content%} {% block body %}{% endblock body%} {% include 'footer.html' %}
-======= -
- - {% block period_navigation %} - - {% endblock period_navigation %} - - {% block content %} - {% endblock content%} - {% block body %} - {% endblock body%} - - -{% include 'footer.html' %} -
->>>>>>> a4433631fb8ac35fdea38581ddea53fbba7115e4
{% block customJS %} diff --git a/templates/ledger/reports/dashboard.html b/templates/ledger/reports/dashboard.html index b7ee155e..7c834496 100644 --- a/templates/ledger/reports/dashboard.html +++ b/templates/ledger/reports/dashboard.html @@ -181,7 +181,7 @@
-
+