templates/sales/estimates/estimate_detail.html

@@ -83,7 +83,7 @@
 
               {% if estimate.sale_orders.first %}
               <!--if sale order exist-->
-             
+              <a href="{% url 'invoice_create' request.dealer.slug estimate.pk %}" class="btn btn-phoenix-primary"><span class="d-none d-sm-inline-block"><i class="fa-solid fa-receipt"></i>  {% trans 'Create Invoice' %}</span></a>
               <a href="{% url 'order_detail' request.dealer.slug estimate.sale_orders.first.pk %}" class="btn btn-phoenix-primary"><span class="d-none d-sm-inline-block">{{ _("Preview Sale Order") }}</span></a>
                    
               {% else %}

templates/users/user_detail.html

@@ -27,11 +27,7 @@
 
                 </div>
                 <h4 class="my-4">Groups</h4>
-<<<<<<< HEAD
-                <a class="btn btn-sm btn-phoenix-primary mt-2 mb-4" href="{% url 'user_groups'   user.slug %}"><i class="fa-solid fa-users"></i> Manage Groups</a>
-=======
                 <a class="btn btn-sm btn-phoenix-primary mt-2 mb-4" href="{% url 'user_groups' request.dealer.slug user_.slug %}"><i class="fa-solid fa-users"></i> Manage Groups</a>
->>>>>>> c9fad7b79c346875a636122fdc7514814180dbc7
                 <table class="table table-hover table-responsive-sm fs-9 mb-0">
                     <thead>
                         <tr>