ismail/haikal
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Po upload update signals #84

Merged
ismail merged 21 commits from frontend into main 2025-06-26 19:11:12 +03:00
Conversation 0 Commits 21 Files Changed 18 -27
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 49d90936fe - Show all commits

27
templates/header.html
View File

@ -28,23 +28,6 @@
</div>
</a>
</li>
<<<<<<< HEAD
<li class="nav-item">
<a class="nav-link" href="{% url 'inventory_item_create' request.dealer.slug %}">
<div class="d-flex align-items-center">
<span class="nav-link-icon"><span class="fas fa-plus-circle"></span></span><span class="nav-link-text">{% trans "add inventory item"|capfirst %}</span>
</div>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'upload_cars' request.dealer.slug %}">
<div class="d-flex align-items-center">
<span class="nav-link-icon"><span class="fas fa-file-import"></span></span><span class="nav-link-text">{% trans "Bulk Upload"|capfirst %}</span>
</div>
</a>
=======
>>>>>>> c9fad7b79c346875a636122fdc7514814180dbc7
</li>
{% endif %}
<li class="nav-item">
@ -277,15 +260,6 @@
</a>
</li>
{% endif %}
<<<<<<< HEAD
<li class="nav-item">
<a class="nav-link" href="{% url 'purchase_order_list' request.dealer.slug %}">
<div class="d-flex align-items-center">
<span class="nav-link-icon"><span class="fas fa-truck-fast"></span></span><span class="nav-link-text">{% trans "purchase Orders"|capfirst %}</span>
</div>
</a>
</li>
=======
{% if perms.django_ledger.view_purchaseordermodel %}
<li class="nav-item">
<a class="nav-link" href="{% url 'purchase_order_list' request.dealer.slug %}">
@ -295,7 +269,6 @@
</a>
</li>
{% endif %}
>>>>>>> c9fad7b79c346875a636122fdc7514814180dbc7
</ul>
</div>
</div>